| commit | a234a4a6004464c2a9850c9fe511dc8bbc76db5f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Jan 30 18:33:46 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 30 18:33:46 2025 -0800 |
| tree | 0252398e3231d14fb92f63804f94a5d639bb648f | |
| parent | c98bf602e38556762c622dd42f829e50d018804c [diff] | |
| parent | 7f031eac07dcebf37b0442bf934cfd3752c31ebc [diff] |
Merge "binderRpcTest: re-enable logs" into main am: 92af73a6c0 am: 7f031eac07 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3464655 Change-Id: I1ed95bea11dd36d3fc6f6b6139fb3f3357a64951 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp index e88e3f3..170b2ad 100644 --- a/libs/binder/tests/binderRpcTest.cpp +++ b/libs/binder/tests/binderRpcTest.cpp
@@ -2771,7 +2771,9 @@ 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 aef9464..0084b9a 100644 --- a/libs/binder/tests/binderRpcTestService.cpp +++ b/libs/binder/tests/binderRpcTestService.cpp
@@ -100,7 +100,9 @@ }; 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]));