Reland "Move precompiled policy to /system partition"
Bug: 285855150
Test: presubmit
Change-Id: Ic1a8bc52d9ac7a8b590ca844db109ab0736dddee
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 3b5040b..2d05c45 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -79,7 +79,6 @@
"microdroid_event-log-tags",
"microdroid_file_contexts",
"microdroid_manifest",
- "microdroid_plat_sepolicy_and_mapping.sha256",
"microdroid_property_contexts",
"mke2fs.microdroid",
"microdroid_fstab",
@@ -100,9 +99,8 @@
// non-updatable & mandatory apexes
"com.android.runtime",
- "microdroid_plat_sepolicy.cil",
- "microdroid_plat_mapping_file",
"microdroid_crashdump_initrd",
+ "microdroid_precompiled_sepolicy",
],
},
lib64: {
@@ -208,23 +206,11 @@
"echo ro.product.cpu.abi=arm64-v8a) > $(out)",
}
+// TODO(b/285855150): remove.
android_filesystem {
name: "microdroid_vendor",
partition_name: "vendor",
use_avb: true,
- deps: [
- "microdroid_precompiled_sepolicy.plat_sepolicy_and_mapping.sha256",
- ],
- multilib: {
- common: {
- deps: [
- "microdroid_vendor_sepolicy.cil",
- "microdroid_plat_pub_versioned.cil",
- "microdroid_plat_sepolicy_vers.txt",
- "microdroid_precompiled_sepolicy",
- ],
- },
- },
avb_private_key: ":microdroid_sign_key",
avb_algorithm: "SHA256_RSA4096",
avb_hash_algorithm: "sha256",