commit 7b54b06e416882ce4888675b027edccd14ff1cc4
author Devin Moore <devinmoore@google.com> Thu Aug 31 17:12:33 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 31 17:12:33 2023 +0000
tree 3d7628d5e3f0b22b45274612ef2553c1d95baec7
parent ff4a606fac1c3545ded4440a0f0fe961dce540d7
parent f22c1f7bdbfb59b56483febb0d11c52d41883238

Merge "hwservicemanager and the allocator are moved to system_ext" into main am: e9a6a01d78 am: bab814bd4c am: f22c1f7bdb

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2610094

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

transport/ServiceManagement.cpp

diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index 637e74b..a5ad23e 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -210,7 +210,8 @@
            fqName == IServiceManager1_2::descriptor;
 }
 static bool isHwServiceManagerInstalled() {
-    return access("/system/bin/hwservicemanager", F_OK) == 0;
+    return access("/system_ext/bin/hwservicemanager", F_OK) == 0 ||
+           access("/system/system_ext/bin/hwservicemanager", F_OK) == 0;
 }
 
 /*

transport/allocator/1.0/default/Android.bp

diff --git a/transport/allocator/1.0/default/Android.bp b/transport/allocator/1.0/default/Android.bp
index 42abe9c..d739cd8 100644
--- a/transport/allocator/1.0/default/Android.bp
+++ b/transport/allocator/1.0/default/Android.bp
@@ -31,6 +31,7 @@
     ],
     init_rc: ["android.hidl.allocator@1.0-service.rc"],
     vintf_fragments: ["android.hidl.allocator@1.0-service.xml"],
+    system_ext_specific: true,
 
     shared_libs: [
         "android.hidl.allocator@1.0",

transport/allocator/1.0/default/android.hidl.allocator@1.0-service.rc

diff --git a/transport/allocator/1.0/default/android.hidl.allocator@1.0-service.rc b/transport/allocator/1.0/default/android.hidl.allocator@1.0-service.rc
index 4f05523..c648aff 100644
--- a/transport/allocator/1.0/default/android.hidl.allocator@1.0-service.rc
+++ b/transport/allocator/1.0/default/android.hidl.allocator@1.0-service.rc
@@ -1,4 +1,4 @@
-service hidl_memory /system/bin/hw/android.hidl.allocator@1.0-service
+service hidl_memory /system/system_ext/bin/hw/android.hidl.allocator@1.0-service
     class hal
     user system
     group system