commit 8c994ac1043566f14ad65c4714b6e254b4f3b139
author Steven Moreland <smoreland@google.com> Wed Oct 24 10:38:11 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 24 10:38:11 2018 -0700
tree 0e662b6b46675d40697ef0c039d9762f8b8fbef0
parent d08c7097a85bbf7537b4f970793af61dcfd1d8cf
parent 4d5f7af71fd92c02681e965d14c97eb0759485d6

Merge "@1.2::IServiceManager:onNoClients->onClients(bool)" am: ccea91f3e1 am: 5787e6b3c2
am: 4d5f7af71f

Change-Id: If949e8c357f7df311abb22a15233d6a4100185c9

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>