Move compatibility files out of prebuilts dir. am: 78b3d573da
am: 43c8ea3b4d
Change-Id: I6962a57683745fd917bacef13996627f3d32bb14
diff --git a/Android.mk b/Android.mk
index 07c075e..f12ba96 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1198,8 +1198,8 @@
# targeting the 26.0 SELinux release. This ensures that our policy will build
# when used on a device that has non-platform policy targetting the 26.0 release.
26.0_compat := $(intermediates)/26.0_compat
-26.0_mapping.cil := $(LOCAL_PATH)/prebuilts/api/26.0/26.0.cil
-26.0_mapping.ignore.cil := $(LOCAL_PATH)/prebuilts/api/26.0/26.0.ignore.cil
+26.0_mapping.cil := $(LOCAL_PATH)/private/compat/26.0/26.0.cil
+26.0_mapping.ignore.cil := $(LOCAL_PATH)/private/compat/26.0/26.0.ignore.cil
26.0_nonplat := $(LOCAL_PATH)/prebuilts/api/26.0/nonplat_sepolicy.cil
$(26.0_compat): PRIVATE_CIL_FILES := \
$(built_plat_cil) $(26.0_mapping.cil) $(26.0_nonplat)
diff --git a/prebuilts/api/26.0/26.0.cil b/private/compat/26.0/26.0.cil
similarity index 100%
rename from prebuilts/api/26.0/26.0.cil
rename to private/compat/26.0/26.0.cil
diff --git a/prebuilts/api/26.0/26.0.ignore.cil b/private/compat/26.0/26.0.ignore.cil
similarity index 100%
rename from prebuilts/api/26.0/26.0.ignore.cil
rename to private/compat/26.0/26.0.ignore.cil
diff --git a/tests/treble_sepolicy_tests.py b/tests/treble_sepolicy_tests.py
index 7584cab..f659677 100644
--- a/tests/treble_sepolicy_tests.py
+++ b/tests/treble_sepolicy_tests.py
@@ -223,7 +223,8 @@
if len(violators) > 0:
ret += "SELinux: The following types were found added to the policy "
ret += "without an entry into the compatibility mapping file(s) found "
- ret += "in prebuilts/api/" + compatMapping.apiLevel + "/\n"
+ ret += "in private/compat/" + compatMapping.apiLevel + "/"
+ ret += compatMapping.apiLevel + "[.ignore].cil/n"
ret += " ".join(str(x) for x in sorted(violators)) + "\n"
return ret