commit 0d49b9bc285e749a78c1f65f264fd0a133a5476f
author Inseob Kim <inseob@google.com> Wed Sep 06 18:01:53 2023 +0900
committer Inseob Kim <inseob@google.com> Thu Sep 07 16:35:08 2023 +0900
tree abe7279a4b26b0043b2ce49658d022bd409e2b16
parent 5d7423ff3de9dc79863e5af61a30a53eebc12691

Use only public cil files for Treble compat test

Rationale for this change:

1) Vendors use only public files, so we should be able to use only
   public cil files for compatibility test.
2) treble_sepolicy_tests_for_release.mk is too complex, because it
   requires compiled sepolicy. Reducing the complexity will help migrate
   into REL build.
3) This fixes a tiny bug of treble_sepolicy_tests that it can't catch
   public types being moved to private types, and then removed. 29.0.cil
   and 30.0.cil change contains such missing public types.

Bug: 296875906
Test: m selinux_policy (with/without intentional breakage)
Change-Id: Ia2c0733176df898f268b5680195da25b588b09c7

prebuilts/api/29.0/Android.bp

diff --git a/prebuilts/api/29.0/Android.bp b/prebuilts/api/29.0/Android.bp
index f791878..fe019b0 100644
--- a/prebuilts/api/29.0/Android.bp
+++ b/prebuilts/api/29.0/Android.bp
@@ -52,4 +52,7 @@
     name: "29.0_plat_policy",
     srcs: [":29.0_plat_policy.cil"],
     installable: false,
+    dist: {
+        targets: ["base-sepolicy-files-for-mapping"],
+    },
 }

prebuilts/api/30.0/Android.bp

diff --git a/prebuilts/api/30.0/Android.bp b/prebuilts/api/30.0/Android.bp
index c124c10..0f89b7c 100644
--- a/prebuilts/api/30.0/Android.bp
+++ b/prebuilts/api/30.0/Android.bp
@@ -52,4 +52,7 @@
     name: "30.0_plat_policy",
     srcs: [":30.0_plat_policy.cil"],
     installable: false,
+    dist: {
+        targets: ["base-sepolicy-files-for-mapping"],
+    },
 }

prebuilts/api/31.0/Android.bp

diff --git a/prebuilts/api/31.0/Android.bp b/prebuilts/api/31.0/Android.bp
index d6c02db..10ec80f 100644
--- a/prebuilts/api/31.0/Android.bp
+++ b/prebuilts/api/31.0/Android.bp
@@ -52,4 +52,7 @@
     name: "31.0_plat_policy",
     srcs: [":31.0_plat_policy.cil"],
     installable: false,
+    dist: {
+        targets: ["base-sepolicy-files-for-mapping"],
+    },
 }

prebuilts/api/32.0/Android.bp

diff --git a/prebuilts/api/32.0/Android.bp b/prebuilts/api/32.0/Android.bp
index 9c49294..f1fb581b 100644
--- a/prebuilts/api/32.0/Android.bp
+++ b/prebuilts/api/32.0/Android.bp
@@ -52,4 +52,7 @@
     name: "32.0_plat_policy",
     srcs: [":32.0_plat_policy.cil"],
     installable: false,
+    dist: {
+        targets: ["base-sepolicy-files-for-mapping"],
+    },
 }

prebuilts/api/33.0/Android.bp

diff --git a/prebuilts/api/33.0/Android.bp b/prebuilts/api/33.0/Android.bp
index 327fc11..980e288 100644
--- a/prebuilts/api/33.0/Android.bp
+++ b/prebuilts/api/33.0/Android.bp
@@ -52,4 +52,7 @@
     name: "33.0_plat_policy",
     srcs: [":33.0_plat_policy.cil"],
     installable: false,
+    dist: {
+        targets: ["base-sepolicy-files-for-mapping"],
+    },
 }

prebuilts/api/34.0/Android.bp

diff --git a/prebuilts/api/34.0/Android.bp b/prebuilts/api/34.0/Android.bp
index 474e29b..30a8075 100644
--- a/prebuilts/api/34.0/Android.bp
+++ b/prebuilts/api/34.0/Android.bp
@@ -52,4 +52,7 @@
     name: "34.0_plat_policy",
     srcs: [":34.0_plat_policy.cil"],
     installable: false,
+    dist: {
+        targets: ["base-sepolicy-files-for-mapping"],
+    },
 }