commit 7c44826eaba2e3ff4483b127c6bc091e46d0604c
author Steven Moreland <smoreland@google.com> Thu Jul 09 16:56:09 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 09 16:56:09 2020 +0000
tree 70b2e49b02ac0485d4010700b3a25a02f6a1a2e1
parent 32fdde7c37170aa9d9dd911688d01029a7bc1205
parent 42e294c71e4619150225e648d3b9b66e9b66c109

Merge "Avoid TREBLE_TESTING_OVERRIDE"

media/bufferpool/1.0/vts/multi.cpp

diff --git a/media/bufferpool/1.0/vts/multi.cpp b/media/bufferpool/1.0/vts/multi.cpp
index 1796819..d8cc285 100644
--- a/media/bufferpool/1.0/vts/multi.cpp
+++ b/media/bufferpool/1.0/vts/multi.cpp
@@ -215,7 +215,7 @@
 }  // anonymous namespace
 
 int main(int argc, char** argv) {
-  setenv("TREBLE_TESTING_OVERRIDE", "true", true);
+  android::hardware::details::setTrebleTestingOverride(true);
   ::testing::InitGoogleTest(&argc, argv);
   int status = RUN_ALL_TESTS();
   LOG(INFO) << "Test result = " << status;

media/bufferpool/2.0/tests/multi.cpp

diff --git a/media/bufferpool/2.0/tests/multi.cpp b/media/bufferpool/2.0/tests/multi.cpp
index 68b6992..b40838e 100644
--- a/media/bufferpool/2.0/tests/multi.cpp
+++ b/media/bufferpool/2.0/tests/multi.cpp
@@ -215,7 +215,7 @@
 }  // anonymous namespace
 
 int main(int argc, char** argv) {
-  setenv("TREBLE_TESTING_OVERRIDE", "true", true);
+  android::hardware::details::setTrebleTestingOverride(true);
   ::testing::InitGoogleTest(&argc, argv);
   int status = RUN_ALL_TESTS();
   LOG(INFO) << "Test result = " << status;