Revert "Move precompiled policy to /system partition"
Revert submission 2625691
Reason for revert: b/287283650
Reverted changes: /q/submissionid:2625691
Change-Id: I4691a3db74df8c22a45634295662d041231596da
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 2d05c45..3b5040b 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -79,6 +79,7 @@
"microdroid_event-log-tags",
"microdroid_file_contexts",
"microdroid_manifest",
+ "microdroid_plat_sepolicy_and_mapping.sha256",
"microdroid_property_contexts",
"mke2fs.microdroid",
"microdroid_fstab",
@@ -99,8 +100,9 @@
// non-updatable & mandatory apexes
"com.android.runtime",
+ "microdroid_plat_sepolicy.cil",
+ "microdroid_plat_mapping_file",
"microdroid_crashdump_initrd",
- "microdroid_precompiled_sepolicy",
],
},
lib64: {
@@ -206,11 +208,23 @@
"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",