commit 86d0ac1a3b251e94010b506c6c2ad6a675612b36
author Changyeon Jo <changyeon@google.com> Thu Mar 26 00:04:00 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 26 00:04:00 2020 +0000
tree f670f0b5b0ef832e7d39ecd4dc487294d46dcbbf
parent 1518b4cef1aff94eb4f8951be28197e42dea4e07
parent 2f07ccd174d2639daab60506b04ff110470d03e9

Revert "Vintf manifest change for Automotive Display service" am: 2f07ccd174

Change-Id: I946376cf57bbdf84d82c1eb3206133bf3083492b

vintfdata/Android.mk

diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk
index 0031a69..bca1cdc 100644
--- a/vintfdata/Android.mk
+++ b/vintfdata/Android.mk
@@ -32,10 +32,6 @@
   SYSTEM_EXT_MANIFEST_INPUT_FILES += $(SYSTEM_EXT_MANIFEST_FILES)
 endif
 
-ifeq ($(BOARD_IS_AUTOMOTIVE), true)
-  FRAMEWORK_MANIFEST_INPUT_FILES += $(LOCAL_PATH)/automotive_manifest.xml
-endif
-
 # VNDK Version in device compatibility matrix and framework manifest
 ifeq ($(BOARD_VNDK_VERSION),current)
 VINTF_VNDK_VERSION := $(PLATFORM_VNDK_VERSION)

vintfdata/automotive_manifest.xml

diff --git a/vintfdata/automotive_manifest.xml b/vintfdata/automotive_manifest.xml
deleted file mode 100644
index 464dcac..0000000
--- a/vintfdata/automotive_manifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest version="1.0" type="framework">
-    <hal>
-        <name>android.frameworks.automotive.display</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IAutomotiveDisplayProxyService</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>