From 4ed3c2fb256a9887af7bb1208dc822ab3606b208 Mon Sep 17 00:00:00 2001 From: Ryan Prichard Date: Thu, 12 Sep 2024 12:18:59 -0700 Subject: [PATCH] zuma: 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.zuma Flag: EXEMPT, refactor to fix build failure Change-Id: I47d0b3a441ab4ec8dd2ad8e794ae84f184d0d40f --- powerstats/ZumaCommonDataProviders.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerstats/ZumaCommonDataProviders.cpp b/powerstats/ZumaCommonDataProviders.cpp index 4b2fef97..e70ffaec 100644 --- a/powerstats/ZumaCommonDataProviders.cpp +++ b/powerstats/ZumaCommonDataProviders.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)); }