commit 33bc33c39589c8e8d25efbab8c968f80c7508082
author Tomasz Wasilczyk <twasilczyk@google.com> Tue Jun 11 20:42:14 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 11 20:42:14 2024 +0000
tree 3692303c1405d4503679044ba635891b889e5ba7
parent aa82c3358bc189ca9093d34b893663e562397ae2
parent ac5c6e57b18f4db2634ac82e5e691932f1e2fdcc

Merge "Binder test services are not tests" into main am: 71414691b6 am: ac5c6e57b1

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

Change-Id: I4d2043372b7087556026347bf43f32d182f1b65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/binder/tests/Android.bp

diff --git a/libs/binder/tests/Android.bp b/libs/binder/tests/Android.bp
index 3fe55d6..4c7684c 100644
--- a/libs/binder/tests/Android.bp
+++ b/libs/binder/tests/Android.bp
@@ -267,6 +267,7 @@
     defaults: [
         "binderRpcTest_common_defaults",
     ],
+    compile_multilib: "first",
 
     srcs: [
         "binderRpcTest.cpp",
@@ -336,7 +337,7 @@
     ],
 }
 
-cc_test {
+cc_binary {
     // The module name cannot start with "binderRpcTest" because
     // then atest tries to execute it as part of binderRpcTest
     name: "binder_rpc_test_service",
@@ -347,7 +348,7 @@
     ],
 }
 
-cc_test {
+cc_binary {
     name: "binder_rpc_test_service_no_kernel",
     defaults: [
         "binderRpcTest_service_defaults",
@@ -358,7 +359,7 @@
     ],
 }
 
-cc_test {
+cc_binary {
     name: "binder_rpc_test_service_single_threaded",
     defaults: [
         "binderRpcTest_service_defaults",
@@ -373,7 +374,7 @@
     ],
 }
 
-cc_test {
+cc_binary {
     name: "binder_rpc_test_service_single_threaded_no_kernel",
     defaults: [
         "binderRpcTest_service_defaults",