OSDN Git Service

Revert "Add manifest fragment"
authorMauro Rossi <issor.oruam@gmail.com>
Mon, 11 Jul 2022 21:41:49 +0000 (23:41 +0200)
committerRob Herring <robherring2@gmail.com>
Mon, 11 Jul 2022 21:59:48 +0000 (15:59 -0600)
This reverts commit 07176f05f7ee43a9907a1225e094675013ed64ba.

The reason is to avoid the following building error:

FAILED:
build/make/core/base_rules.mk:526:
error: overriding commands for target `out/target/product/x86_64/system/vendor/etc/vintf/manifest/gbm_gralloc_manifest.xml',
previously defined at build/make/core/base_rules.mk:526

Android.mk
gbm_gralloc_manifest.xml [deleted file]

index 61787d0..4c03865 100644 (file)
@@ -40,7 +40,6 @@ LOCAL_MODULE := gralloc.gbm
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_PROPRIETARY_MODULE := true
-LOCAL_VINTF_FRAGMENTS := gbm_gralloc_manifest.xml
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/gbm_gralloc_manifest.xml b/gbm_gralloc_manifest.xml
deleted file mode 100644 (file)
index 915883a..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>android.hardware.graphics.allocator</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>IAllocator</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>