From c92b81622d3dd3eecaf3361fd0e19e3cd98eed70 Mon Sep 17 00:00:00 2001 From: Ryan Prichard Date: Thu, 12 Sep 2024 13:18:03 -0700 Subject: [PATCH] gs201: 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.gs201 Flag: EXEMPT, refactor to fix build failure Change-Id: Ic355f68c4ebb09e204ea3fb4822940aad07ccd7b --- powerstats/Gs201CommonDataProviders.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp index 2b1f5618..5f96ea35 100644 --- a/powerstats/Gs201CommonDataProviders.cpp +++ b/powerstats/Gs201CommonDataProviders.cpp @@ -274,7 +274,7 @@ void addSoC(std::shared_ptr p) { } void setEnergyMeter(std::shared_ptr p) { - std::vector deviceNames { "s2mpg12-odpm", "s2mpg13-odpm" }; + std::vector deviceNames { "s2mpg12-odpm", "s2mpg13-odpm" }; p->setEnergyMeterDataProvider(std::make_unique(deviceNames, true)); }