Merge "binderRpcTest: re-enable logs" into main

Author: Treehugger Robot

libs/binder/tests/binderRpcTest.cpp

@@ -2771,7 +2771,9 @@ INSTANTIATE_TEST_SUITE_P(
 
 int main(int argc, char** argv) {
     ::testing::InitGoogleTest(&argc, argv);
+#ifndef __ANDROID__
     __android_log_set_logger(__android_log_stderr_logger);
+#endif
 
     return RUN_ALL_TESTS();
 }

libs/binder/tests/binderRpcTestService.cpp

@@ -100,7 +100,9 @@ class MyBinderRpcTestAndroid : public MyBinderRpcTestBase {
 };
 
 int main(int argc, char* argv[]) {
+#ifndef __ANDROID__
     __android_log_set_logger(__android_log_stderr_logger);
+#endif
 
     LOG_ALWAYS_FATAL_IF(argc != 3, "Invalid number of arguments: %d", argc);
     unique_fd writeEnd(atoi(argv[1]));