commit c281055a2bfc190143793978431370d8eb36ea30
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 09 18:03:19 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 09 18:03:19 2020 +0000
tree 2b53566fa3a31e8089be7c39acebef00445be8df
parent 88fdc661b92209dd115da725454e0b4b38b31f8d
parent 85a9d3225ae03ec18205056caf5c5c0321941c0f

Merge "Avoid TREBLE_TESTING_OVERRIDE"

libs/binderthreadstate/test.cpp

diff --git a/libs/binderthreadstate/test.cpp b/libs/binderthreadstate/test.cpp
index 68cc225..44e2fd1 100644
--- a/libs/binderthreadstate/test.cpp
+++ b/libs/binderthreadstate/test.cpp
@@ -165,7 +165,6 @@
     android::ProcessState::self()->startThreadPool();
 
     // HIDL
-    setenv("TREBLE_TESTING_OVERRIDE", "true", true);
     android::hardware::configureRpcThreadpool(1, true /*callerWillJoin*/);
     sp<IHidlStuff> hidlServer = new HidlServer(thisId, otherId);
     CHECK(OK == hidlServer->registerAsService(id2name(thisId).c_str()));
@@ -176,7 +175,7 @@
 
 int main(int argc, char** argv) {
     ::testing::InitGoogleTest(&argc, argv);
-    setenv("TREBLE_TESTING_OVERRIDE", "true", true);
+    android::hardware::details::setTrebleTestingOverride(true);
     if (fork() == 0) {
         prctl(PR_SET_PDEATHSIG, SIGHUP);
         return server(kP1Id, kP2Id);