summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jooyung Han <jooyung@google.com> 2022-11-15 06:37:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-15 06:37:58 +0000
commitcd5f30eb5f7842431f711554ea37ccc3beb51a8a (patch)
tree3a69c5dd09053acef31b61185df74ce3d34d1f63
parent7cfc7afb7a9a82282d0f829220ca30b6afd56101 (diff)
parentc7ead71bd5541838897fd9e7e95cbf94a5809f0b (diff)
Merge "Make servicemanager.microdroid uninstallable" am: c7ead71bd5
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2302418 Change-Id: Ib978a8ad9698f98519b0961fa07b65b2f25c7a54 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--cmds/servicemanager/Android.bp3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmds/servicemanager/Android.bp b/cmds/servicemanager/Android.bp
index fd879c6c34..61f931e0d2 100644
--- a/cmds/servicemanager/Android.bp
+++ b/cmds/servicemanager/Android.bp
@@ -53,6 +53,9 @@ cc_binary {
init_rc: ["servicemanager.microdroid.rc"],
srcs: ["main.cpp"],
bootstrap: true,
+ // Prevent this from being installed when running tests in this directory.
+ // This is okay because microdorid build rule can bundle this anyway.
+ installable: false,
}
cc_binary {