commit 69b0e66a3d33f21bb99901ce6dce04b0cb888b8e
author Steven Moreland <smoreland@google.com> Wed Jun 20 16:00:28 2018 -0700
committer Po-Chien Hsueh <pchsueh@google.com> Tue Jul 31 02:47:14 2018 +0000
tree 5810a41ecd5044e31e4c3386dede63f792397be5
parent 791967f6ffefff44e08dea167b17a9662d340bf9

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)

vintfdata/Android.mk

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