commit 2512788f7b91e9a1028b3acdcff9c7f9b29b6dbb
author Steven Moreland <smoreland@google.com> Thu Jan 31 14:01:50 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 31 14:01:50 2019 -0800
tree 11fad7e9913f7089cc707dc9e48dce682541e4ce
parent 4e97f8bb8f671b4b294a2a58ea2586b1849b3159
parent 926731d441f70d1d78119b6b456fc51dd64ab016

[automerger skipped] Fix race conditions for lazy services. am: afa0d58951 am: 2b092f9220 -s ours
am: 926731d441 -s ours
am skip reason: change_id I3ee26ba96dbc9732e72aaa16281abc47ce6a02c9 with SHA1 ea2fb55120 is in history

Change-Id: If4cd2f0794d56039767c503d161cfeea66581e43

vintfdata/Android.mk

diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk
index 232ef6f..3db7065 100644
--- a/vintfdata/Android.mk
+++ b/vintfdata/Android.mk
@@ -17,10 +17,6 @@
 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

vintfdata/manifest_vr_hwc.xml

diff --git a/vintfdata/manifest_vr_hwc.xml b/vintfdata/manifest_vr_hwc.xml
deleted file mode 100644
index 1068cac..0000000
--- a/vintfdata/manifest_vr_hwc.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<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>