Reland "Use system's plat_sepolicy.cil for microdroid"
This reverts commit e2071485be4931ccf40cb7d84bcf03a760c9007d.
Reason for revert: fixed breakage
The breakage was due to the difference between plat_sepolicy.conf and
microdroid_vendor_sepolicy.conf. Now vendor_sepolicy.conf is built with
se_policy_conf module, so it is synced with plat_sepolicy.conf
Test: boot microdroid with and without SANITIZE_TARGET=address
Change-Id: Ib2bb5ec651f61fb9e6de370e055f4d2119d9e17f
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index e818420..f853b75 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -59,7 +59,6 @@
// These files are temporary and only for test.
// TODO(b/178993690): migrate cil files to Soong
- "microdroid_plat_sepolicy.cil",
"microdroid_plat_mapping_file",
"microdroid_plat_sepolicy_and_mapping.sha256",
] + microdroid_shell_and_utilities,
@@ -67,6 +66,7 @@
common: {
deps: [
"com.android.runtime",
+ "plat_sepolicy.cil",
"plat_file_contexts",
"plat_hwservice_contexts",
"plat_property_contexts",
@@ -247,7 +247,7 @@
genrule {
name: "microdroid_plat_sepolicy_and_mapping.sha256_gen",
srcs: [
- ":microdroid_plat_sepolicy.cil",
+ ":plat_sepolicy.cil",
":microdroid_plat_mapping_file",
],
out: ["plat_sepolicy_and_mapping.sha256"],
@@ -276,7 +276,7 @@
name: "microdroid_precompiled_sepolicy_gen",
tools: ["secilc"],
srcs: [
- ":microdroid_plat_sepolicy.cil",
+ ":plat_sepolicy.cil",
":microdroid_plat_mapping_file",
":microdroid_plat_pub_versioned.cil",
":microdroid_vendor_sepolicy.cil",