summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jooyung Han <jooyung@google.com> 2022-11-15 08:02:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-15 08:02:57 +0000
commit3ccefe72c9a23a410f1ececf3bfefcc96bfc8226 (patch)
tree20dab3096aa9dd0b992821f9adb717b39709878c
parent79b76d190b1c6bf78fe4ade91c0d6f1a4c637ee7 (diff)
parentc4e1c0b3abdbdebbf64bf0c5697b694de3c61f70 (diff)
Merge "Make servicemanager.microdroid uninstallable" am: c7ead71bd5 am: cd5f30eb5f am: c4e1c0b3ab
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2302418 Change-Id: I289d8643f12e0c741c9c247269c69d0c8b5307ab 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 {