diff options
| author | 2025-01-30 18:09:28 -0800 | |
|---|---|---|
| committer | 2025-01-30 18:09:28 -0800 | |
| commit | 7f031eac07dcebf37b0442bf934cfd3752c31ebc (patch) | |
| tree | 6489d51799785e2fd94a554b894c1d6a10c9e4bb | |
| parent | 6185ba68131a2fcfd51fad160fc851b4b7acf888 (diff) | |
| parent | 92af73a6c068e3c260df570d2df95705e02c6bc3 (diff) | |
Merge "binderRpcTest: re-enable logs" into main am: 92af73a6c0
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3464655
Change-Id: Id6a0005744471bd31ad82628d0bb4e434d583ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/tests/binderRpcTest.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/tests/binderRpcTestService.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp index e88e3f3530..170b2adfbb 100644 --- a/libs/binder/tests/binderRpcTest.cpp +++ b/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(); } diff --git a/libs/binder/tests/binderRpcTestService.cpp b/libs/binder/tests/binderRpcTestService.cpp index aef946481f..0084b9ada2 100644 --- a/libs/binder/tests/binderRpcTestService.cpp +++ b/libs/binder/tests/binderRpcTestService.cpp @@ -100,7 +100,9 @@ public: }; 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])); |