Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4572ce6d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid TREBLE_TESTING_OVERRIDE" am: c281055a am: 57a13adb am: 7bcfb608 am: 65a74d67 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1357928

Change-Id: I3fe3bde8ea16056b7ef622f84cf57aa8f3c41e4c
parents d68ecff7 65a74d67

libs/binderthreadstate/test.cpp

+1 −2
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ int server(size_t thisId, size_t otherId) { 
    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 server(size_t thisId, size_t otherId) { 


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);