From cbb28eab671def4ba38d47c1b3f5602cebfbdd33 Mon Sep 17 00:00:00 2001 From: Ryan Prichard Date: Thu, 12 Sep 2024 13:15:56 -0700 Subject: [PATCH] gs101: 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.gs101 Flag: EXEMPT, refactor to fix build failure Change-Id: Ia66a69a9375971223b712d695f5ea5f2c1e26c19 --- powerstats/Gs101CommonDataProviders.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerstats/Gs101CommonDataProviders.cpp b/powerstats/Gs101CommonDataProviders.cpp index 615bb164..85bbbc45 100644 --- a/powerstats/Gs101CommonDataProviders.cpp +++ b/powerstats/Gs101CommonDataProviders.cpp @@ -343,7 +343,7 @@ void addSoC(std::shared_ptr p) { } void setEnergyMeter(std::shared_ptr p) { - std::vector deviceNames { "s2mpg10-odpm", "s2mpg11-odpm" }; + std::vector deviceNames { "s2mpg10-odpm", "s2mpg11-odpm" }; p->setEnergyMeterDataProvider(std::make_unique(deviceNames, true)); }