commit 0c4c1535a1e0ce3049f4f8b7966652c03d9577fe
author Steven Moreland <smoreland@google.com> Tue Oct 30 13:50:04 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 30 13:50:04 2018 -0700
tree 7e14991306116c3e49de2c45fe2e859cd2b59761
parent 65bccc8767a8a3d0854e43250ac4a16948e37e5c
parent ea34407bf2c6d987eea5efcc952d77870e186521

Merge "hidl_enum_range: support const/reverse iteration" am: 389898f71e am: b152218df7
am: ea34407bf2

Change-Id: I3085ef52e272c08132ef95a2d3d38a529afaaf52

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>