summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin Moore <devinmoore@google.com>2023-08-31 16:25:07 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-08-31 16:25:07 +0000
commit5a3e43549a214fe9dc1cb755790dc3c804554734 (patch)
treea8a4b391b18045c4b28ef8ae9b9456d9b5d72c54
parent75cdf184f77217f434b4a7dbf89679a0fda026a3 (diff)
parent2f22667a4c14fadc2ae52af809c481ebf2d8bd66 (diff)
downloadhwservicemanager-5a3e43549a214fe9dc1cb755790dc3c804554734.tar.gz
Merge "Move hwservicemanager to system_ext" into main am: 076137f531 am: 2f22667a4c
Original change: https://android-review.googlesource.com/c/platform/system/hwservicemanager/+/2609602 Change-Id: I7c3ada512713e7be3baeba9219f5030e6b5b33cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp1
-rw-r--r--hwservicemanager.rc2
2 files changed, 2 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 2997044..f3f2342 100644
--- a/Android.bp
+++ b/Android.bp
@@ -111,6 +111,7 @@ cc_binary {
"libtokenmanager",
],
bootstrap: true,
+ system_ext_specific: true,
}
cc_test {
diff --git a/hwservicemanager.rc b/hwservicemanager.rc
index df5d7af..7ad492b 100644
--- a/hwservicemanager.rc
+++ b/hwservicemanager.rc
@@ -1,4 +1,4 @@
-service hwservicemanager /system/bin/hwservicemanager
+service hwservicemanager /system/system_ext/bin/hwservicemanager
user system
disabled
group system readproc