Reland "Remove vendor_manifest.xml and vendor_compatibil..."
Bug: 285855150
Test: presubmit
Change-Id: I17fec14d35fab096988ef8d1dba8e00a32f1fd4e
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 7ac450e..3b5040b 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -214,8 +214,6 @@
use_avb: true,
deps: [
"microdroid_precompiled_sepolicy.plat_sepolicy_and_mapping.sha256",
- "microdroid_vendor_manifest",
- "microdroid_vendor_compatibility_matrix",
],
multilib: {
common: {
@@ -344,22 +342,6 @@
}
prebuilt_etc {
- name: "microdroid_vendor_manifest",
- src: "microdroid_vendor_manifest.xml",
- filename: "manifest.xml",
- relative_install_path: "vintf",
- installable: false,
-}
-
-prebuilt_etc {
- name: "microdroid_vendor_compatibility_matrix",
- src: "microdroid_vendor_compatibility_matrix.xml",
- filename: "compatibility_matrix.xml",
- relative_install_path: "vintf",
- installable: false,
-}
-
-prebuilt_etc {
name: "microdroid_manifest",
src: "microdroid_manifest.xml",
filename: "manifest.xml",
diff --git a/microdroid/microdroid_vendor_compatibility_matrix.xml b/microdroid/microdroid_vendor_compatibility_matrix.xml
deleted file mode 100644
index 44735d8..0000000
--- a/microdroid/microdroid_vendor_compatibility_matrix.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<compatibility-matrix version="1.0" type="device">
- <!-- empty -->
-</compatibility-matrix>
diff --git a/microdroid/microdroid_vendor_manifest.xml b/microdroid/microdroid_vendor_manifest.xml
deleted file mode 100644
index a48e695..0000000
--- a/microdroid/microdroid_vendor_manifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest version="1.0" type="device" />