commit 6a9e5560af4df421bae18f28c65309e51ebc9a8d
author Logan Chien <loganchien@google.com> Tue Oct 23 23:03:20 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 23 23:03:20 2018 -0700
tree d9ca0daf74a7ba974abc33922ff46a885de7508f
parent f8a44031e08a232898479f956b92f03edc9a921c
parent cb59e24764b6866e252b3710c1752f2983013142

Use static linkage to reduce user/userdebug differences am: 73fe94d196 am: e07ac3a0f5
am: cb59e24764

Change-Id: I3cd2fa66e930b6d3b012bb388350e7c62fd81891

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>