From 678b37960e9cea71ccdf7d72bfd1dd653be310ef Mon Sep 17 00:00:00 2001 From: Ryan Prichard Date: Thu, 12 Sep 2024 12:27:36 -0700 Subject: [PATCH] zumapro: avoid vector std::vector uses std::allocator, which is an undocumented libc++ extension to the C++ standard library. The extension was removed in llvm.org/PR96319. Use an ordinary non-const T instead. Bug: http://b/349681543 Test: m android.hardware.power.stats-impl.zumapro Flag: EXEMPT, refactor to fix build failure Change-Id: I96ab1eb2caf092008cc573949a1529c057ee4bb1 --- powerstats/ZumaProCommonDataProviders.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerstats/ZumaProCommonDataProviders.cpp b/powerstats/ZumaProCommonDataProviders.cpp index 4bd3559..bfde924 100644 --- a/powerstats/ZumaProCommonDataProviders.cpp +++ b/powerstats/ZumaProCommonDataProviders.cpp @@ -282,7 +282,7 @@ void addSoC(std::shared_ptr p) { } void setEnergyMeter(std::shared_ptr p) { - std::vector deviceNames { "s2mpg14-odpm", "s2mpg15-odpm" }; + std::vector deviceNames { "s2mpg14-odpm", "s2mpg15-odpm" }; p->setEnergyMeterDataProvider(std::make_unique(deviceNames, true)); }