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

Commit eb5e11ba authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "Avoid TREBLE_TESTING_OVERRIDE" am: 7c44826e am: fd601b72 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1358624

Change-Id: Ia17d6a8157eca605fe8ff457a8b4ebf1d16e1392
parents a0706cae fd601b72

media/bufferpool/1.0/vts/multi.cpp

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ TEST_F(BufferpoolMultiTest, TransferBuffer) { 
}  // 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

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ TEST_F(BufferpoolMultiTest, TransferBuffer) { 
}  // 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;