Split vr_hwc manifest entry.
It is only installed on some devices.
Bug: 109913118
Bug: 111963599
Test: vts_treble_vintf_test on a new phone
Test: lshal on a new phone
Test: manually verify vintf manifest using 'vintf' binary
Test: VTS does not run the composer test for the vr instance
Change-Id: I0865fc9be40e318f77a95d970db0548aad5063ff
Merged-In: I0865fc9be40e318f77a95d970db0548aad5063ff
(cherry picked from commit 2cc593da608732f4b663f0b0c07a9b013607e4e2)
diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk
index 3db7065..232ef6f 100644
--- a/vintfdata/Android.mk
+++ b/vintfdata/Android.mk
@@ -17,6 +17,10 @@
LOCAL_PATH := $(call my-dir)
FRAMEWORK_MANIFEST_INPUT_FILES := $(LOCAL_PATH)/manifest.xml
+# TODO(b/110487738): replace with vintf_fragment
+ifdef USE_VR_FLINGER
+ FRAMEWORK_MANIFEST_INPUT_FILES += $(LOCAL_PATH)/manifest_vr_hwc.xml
+endif
ifdef DEVICE_FRAMEWORK_MANIFEST_FILE
FRAMEWORK_MANIFEST_INPUT_FILES += $(DEVICE_FRAMEWORK_MANIFEST_FILE)
endif
diff --git a/vintfdata/manifest.xml b/vintfdata/manifest.xml
index 582b5eb..27919d3 100644
--- a/vintfdata/manifest.xml
+++ b/vintfdata/manifest.xml
@@ -71,15 +71,6 @@
<instance>default</instance>
</interface>
</hal>
- <hal>
- <name>android.hardware.graphics.composer</name>
- <transport>hwbinder</transport>
- <version>2.1</version>
- <interface>
- <name>IComposer</name>
- <instance>vr</instance>
- </interface>
- </hal>
<hal format="native">
<name>netutils-wrapper</name>
<!--
diff --git a/vintfdata/manifest_vr_hwc.xml b/vintfdata/manifest_vr_hwc.xml
new file mode 100644
index 0000000..1068cac
--- /dev/null
+++ b/vintfdata/manifest_vr_hwc.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="framework">
+ <hal>
+ <name>android.hardware.graphics.composer</name>
+ <transport>hwbinder</transport>
+ <version>2.1</version>
+ <interface>
+ <name>IComposer</name>
+ <instance>vr</instance>
+ </interface>
+ </hal>
+</manifest>