move hwservicemanager fragments

PRODUCT_HIDL_ENABLED is used to force HIDL to be enabled for device bring-up when
partners have converted all of their AOSP HAL implementations to AIDL,
but still have some partner-owned interfaces that they are working on
converting from HIDL TO AIDL.

To allow for this behavior, we need to use a different manifest fragment
that doesn't have the `max-level="8"` entry on it so hwservicemanager
will see itself as registered.

We have to decouple the manifest fragment from the hwservicemanger binary
so we can choose which one to install based on the PRODUCT_HIDL_ENABLED
variable.

Test: PRODUCT_HIDL_ENABLED = true && adb shell lshal
Test: PRODUCT_HIDL_ENABLED = false && adb shell lshal
Bug: 332548148

Change-Id: I6b3a9ce44527ff98736136b106a9885cf95fa1c9

2 files changed, 20 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index be2c463..bf15d51 100644
--- a/Android.bp
+++ b/Android.bp
@@ -94,9 +94,6 @@ cc_binary {
         "libhwservicemanager_shared_libs",
         "libtokenmanager_shared_libs",
     ],
-    vintf_fragments: [
-        "hwservicemanager.xml",
-    ],
     init_rc: [
         "hwservicemanager.rc",
     ],
diff --git a/hwservicemanager_no_max.xml b/hwservicemanager_no_max.xml
new file mode 100644
index 0000000..65220d8
--- /dev/null
+++ b/hwservicemanager_no_max.xml
@@ -0,0 +1,20 @@
+<manifest version="1.0" type="framework">
+    <hal>
+        <name>android.hidl.manager</name>
+        <transport>hwbinder</transport>
+        <version>1.2</version>
+        <interface>
+            <name>IServiceManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal>
+        <name>android.hidl.token</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ITokenManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>