Revert "Fix treble tests to use public cil only"
This reverts commit eb6b30fb4ec67dc2400e2d411d20dc3f43fa8919.
Reason for revert: <Reason for revert: Dorid monitor: Likely culprit for b/391044099 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>
Change-Id: I02e79b30cc9ccd6bfb7259999f18be573688fe50
diff --git a/private/compat/202404/202404.ignore.cil b/private/compat/202404/202404.ignore.cil
index 8007d6c..c10b0d5 100644
--- a/private/compat/202404/202404.ignore.cil
+++ b/private/compat/202404/202404.ignore.cil
@@ -12,7 +12,6 @@
crosvm
early_virtmgr
early_virtmgr_exec
- enable_16k_pages_prop
forensic_service
fstype_prop
hal_mediaquality_service
diff --git a/private/compat/30.0/30.0.ignore.cil b/private/compat/30.0/30.0.ignore.cil
index 8eba423..0a3d2e9 100644
--- a/private/compat/30.0/30.0.ignore.cil
+++ b/private/compat/30.0/30.0.ignore.cil
@@ -22,7 +22,6 @@
artd
artd_exec
artd_service
- atrace
authorization_service
bootanim_config_prop
camerax_extensions_prop
@@ -139,7 +138,6 @@
system_suspend_control_internal_service
task_profiles_api_file
texttospeech_service
- traced_tmpfs
translation_service
update_engine_stable_service
userdata_sysdev
diff --git a/private/compat/32.0/32.0.ignore.cil b/private/compat/32.0/32.0.ignore.cil
index dd74cd8..43ce0a1 100644
--- a/private/compat/32.0/32.0.ignore.cil
+++ b/private/compat/32.0/32.0.ignore.cil
@@ -12,7 +12,6 @@
attestation_verification_service
bluetooth_config_prop
binderfs_features
- bpfloader
charger_vendor
cloudsearch
cloudsearch_service
@@ -59,7 +58,6 @@
hal_wifi_supplicant_service
locale_service
mdns_service
- mediatranscoding
nearby_service
persist_wm_debug_prop
proc_watermark_boost_factor
diff --git a/private/compat/33.0/33.0.cil b/private/compat/33.0/33.0.cil
index 16babe7..204048e 100644
--- a/private/compat/33.0/33.0.cil
+++ b/private/compat/33.0/33.0.cil
@@ -2083,7 +2083,7 @@
(typeattributeset permission_checker_service_33_0 (permission_checker_service))
(typeattributeset permission_service_33_0 (permission_service))
(typeattributeset permissionmgr_service_33_0 (permissionmgr_service))
-(typeattributeset persist_debug_prop_33_0 (persist_debug_prop system_user_mode_emulation_prop))
+(typeattributeset persist_debug_prop_33_0 (persist_debug_prop))
(typeattributeset persist_vendor_debug_wifi_prop_33_0 (persist_vendor_debug_wifi_prop))
(typeattributeset persist_wm_debug_prop_33_0 (persist_wm_debug_prop))
(typeattributeset persistent_data_block_service_33_0 (persistent_data_block_service))
diff --git a/treble_sepolicy_tests_for_release/Android.bp b/treble_sepolicy_tests_for_release/Android.bp
index c6ce0df..d27dc56 100644
--- a/treble_sepolicy_tests_for_release/Android.bp
+++ b/treble_sepolicy_tests_for_release/Android.bp
@@ -36,7 +36,7 @@
java_genrule {
name: "treble_sepolicy_tests_29.0",
srcs: [
- ":29.0_plat_pub_policy.cil",
+ ":29.0_plat_policy.cil",
":29.0_mapping.combined.cil",
":base_plat_pub_policy.cil",
],
@@ -45,7 +45,7 @@
cmd: "$(location treble_sepolicy_tests) " +
"-b $(location :base_plat_pub_policy.cil) " +
"-m $(location :29.0_mapping.combined.cil) " +
- "-o $(location :29.0_plat_pub_policy.cil) && " +
+ "-o $(location :29.0_plat_policy.cil) && " +
"touch $(out)",
}
@@ -86,7 +86,7 @@
java_genrule {
name: "treble_sepolicy_tests_30.0",
srcs: [
- ":30.0_plat_pub_policy.cil",
+ ":30.0_plat_policy.cil",
":30.0_mapping.combined.cil",
] + select((
soong_config_variable("ANDROID", "HAS_BOARD_SYSTEM_EXT_PREBUILT_DIR"),
@@ -104,12 +104,12 @@
(false, false): "$(location treble_sepolicy_tests) " +
"-b $(location :base_plat_pub_policy.cil) " +
"-m $(location :30.0_mapping.combined.cil) " +
- "-o $(location :30.0_plat_pub_policy.cil) && " +
+ "-o $(location :30.0_plat_policy.cil) && " +
"touch $(out)",
(default, default): "$(location treble_sepolicy_tests) " +
"-b $(location :base_product_pub_policy.cil) " +
"-m $(location :30.0_mapping.combined.cil) " +
- "-o $(location :30.0_plat_pub_policy.cil) && " +
+ "-o $(location :30.0_plat_policy.cil) && " +
"touch $(out)",
}),
}
@@ -151,7 +151,7 @@
java_genrule {
name: "treble_sepolicy_tests_31.0",
srcs: [
- ":31.0_plat_pub_policy.cil",
+ ":31.0_plat_policy.cil",
":31.0_mapping.combined.cil",
] + select((
soong_config_variable("ANDROID", "HAS_BOARD_SYSTEM_EXT_PREBUILT_DIR"),
@@ -169,12 +169,12 @@
(false, false): "$(location treble_sepolicy_tests) " +
"-b $(location :base_plat_pub_policy.cil) " +
"-m $(location :31.0_mapping.combined.cil) " +
- "-o $(location :31.0_plat_pub_policy.cil) && " +
+ "-o $(location :31.0_plat_policy.cil) && " +
"touch $(out)",
(default, default): "$(location treble_sepolicy_tests) " +
"-b $(location :base_product_pub_policy.cil) " +
"-m $(location :31.0_mapping.combined.cil) " +
- "-o $(location :31.0_plat_pub_policy.cil) && " +
+ "-o $(location :31.0_plat_policy.cil) && " +
"touch $(out)",
}),
}
@@ -216,7 +216,7 @@
java_genrule {
name: "treble_sepolicy_tests_32.0",
srcs: [
- ":32.0_plat_pub_policy.cil",
+ ":32.0_plat_policy.cil",
":32.0_mapping.combined.cil",
] + select((
soong_config_variable("ANDROID", "HAS_BOARD_SYSTEM_EXT_PREBUILT_DIR"),
@@ -234,12 +234,12 @@
(false, false): "$(location treble_sepolicy_tests) " +
"-b $(location :base_plat_pub_policy.cil) " +
"-m $(location :32.0_mapping.combined.cil) " +
- "-o $(location :32.0_plat_pub_policy.cil) && " +
+ "-o $(location :32.0_plat_policy.cil) && " +
"touch $(out)",
(default, default): "$(location treble_sepolicy_tests) " +
"-b $(location :base_product_pub_policy.cil) " +
"-m $(location :32.0_mapping.combined.cil) " +
- "-o $(location :32.0_plat_pub_policy.cil) && " +
+ "-o $(location :32.0_plat_policy.cil) && " +
"touch $(out)",
}),
}
@@ -281,7 +281,7 @@
java_genrule {
name: "treble_sepolicy_tests_33.0",
srcs: [
- ":33.0_plat_pub_policy.cil",
+ ":33.0_plat_policy.cil",
":33.0_mapping.combined.cil",
] + select((
soong_config_variable("ANDROID", "HAS_BOARD_SYSTEM_EXT_PREBUILT_DIR"),
@@ -299,12 +299,12 @@
(false, false): "$(location treble_sepolicy_tests) " +
"-b $(location :base_plat_pub_policy.cil) " +
"-m $(location :33.0_mapping.combined.cil) " +
- "-o $(location :33.0_plat_pub_policy.cil) && " +
+ "-o $(location :33.0_plat_policy.cil) && " +
"touch $(out)",
(default, default): "$(location treble_sepolicy_tests) " +
"-b $(location :base_product_pub_policy.cil) " +
"-m $(location :33.0_mapping.combined.cil) " +
- "-o $(location :33.0_plat_pub_policy.cil) && " +
+ "-o $(location :33.0_plat_policy.cil) && " +
"touch $(out)",
}),
}
@@ -346,7 +346,7 @@
java_genrule {
name: "treble_sepolicy_tests_34.0",
srcs: [
- ":34.0_plat_pub_policy.cil",
+ ":34.0_plat_policy.cil",
":34.0_mapping.combined.cil",
] + select((
soong_config_variable("ANDROID", "HAS_BOARD_SYSTEM_EXT_PREBUILT_DIR"),
@@ -364,12 +364,12 @@
(false, false): "$(location treble_sepolicy_tests) " +
"-b $(location :base_plat_pub_policy.cil) " +
"-m $(location :34.0_mapping.combined.cil) " +
- "-o $(location :34.0_plat_pub_policy.cil) && " +
+ "-o $(location :34.0_plat_policy.cil) && " +
"touch $(out)",
(default, default): "$(location treble_sepolicy_tests) " +
"-b $(location :base_product_pub_policy.cil) " +
"-m $(location :34.0_mapping.combined.cil) " +
- "-o $(location :34.0_plat_pub_policy.cil) && " +
+ "-o $(location :34.0_plat_policy.cil) && " +
"touch $(out)",
}),
}
@@ -416,7 +416,7 @@
java_genrule {
name: "treble_sepolicy_tests_202404",
srcs: [
- ":202404_plat_pub_policy.cil",
+ ":202404_plat_policy.cil",
":202404_mapping.combined.cil",
] + select((
soong_config_variable("ANDROID", "HAS_BOARD_SYSTEM_EXT_PREBUILT_DIR"),
@@ -437,12 +437,12 @@
(default, false, false): "$(location treble_sepolicy_tests) " +
"-b $(location :base_plat_pub_policy.cil) " +
"-m $(location :202404_mapping.combined.cil) " +
- "-o $(location :202404_plat_pub_policy.cil) && " +
+ "-o $(location :202404_plat_policy.cil) && " +
"touch $(out)",
(default, default, default): "$(location treble_sepolicy_tests) " +
"-b $(location :base_product_pub_policy.cil) " +
"-m $(location :202404_mapping.combined.cil) " +
- "-o $(location :202404_plat_pub_policy.cil) && " +
+ "-o $(location :202404_plat_policy.cil) && " +
"touch $(out)",
}),
}