Merge changes from topic "31.0_compat_mapping" am: 111c57970f

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/1736247

Change-Id: I59edf3d07b3a12dd3c56b8e64ed86e25e2aa357a

Android.bp

@@ -79,6 +79,13 @@ se_filegroup {
     ],
 }
 
+se_filegroup {
+    name: "31.0.board.compat.map",
+    srcs: [
+        "compat/31.0/31.0.cil",
+    ],
+}
+
 se_filegroup {
     name: "26.0.board.compat.cil",
     srcs: [
@@ -114,6 +121,13 @@ se_filegroup {
     ],
 }
 
+se_filegroup {
+    name: "31.0.board.compat.cil",
+    srcs: [
+        "compat/31.0/31.0.compat.cil",
+    ],
+}
+
 se_filegroup {
     name: "26.0.board.ignore.map",
     srcs: [
@@ -149,6 +163,13 @@ se_filegroup {
     ],
 }
 
+se_filegroup {
+    name: "31.0.board.ignore.map",
+    srcs: [
+        "compat/31.0/31.0.ignore.cil",
+    ],
+}
+
 se_cil_compat_map {
     name: "plat_26.0.cil",
     stem: "26.0.cil",
@@ -181,7 +202,14 @@ se_cil_compat_map {
     name: "plat_30.0.cil",
     stem: "30.0.cil",
     bottom_half: [":30.0.board.compat.map"],
-    // top_half: "plat_31.0.cil",
+    top_half: "plat_31.0.cil",
+}
+
+se_cil_compat_map {
+    name: "plat_31.0.cil",
+    stem: "31.0.cil",
+    bottom_half: [":31.0.board.compat.map"],
+    // top_half: "plat_32.0.cil",
 }
 
 se_cil_compat_map {
@@ -220,7 +248,15 @@ se_cil_compat_map {
     name: "system_ext_30.0.cil",
     stem: "30.0.cil",
     bottom_half: [":30.0.board.compat.map"],
-    // top_half: "system_ext_31.0.cil",
+    top_half: "system_ext_31.0.cil",
+    system_ext_specific: true,
+}
+
+se_cil_compat_map {
+    name: "system_ext_31.0.cil",
+    stem: "31.0.cil",
+    bottom_half: [":31.0.board.compat.map"],
+    // top_half: "system_ext_32.0.cil",
     system_ext_specific: true,
 }
 
@@ -260,7 +296,15 @@ se_cil_compat_map {
     name: "product_30.0.cil",
     stem: "30.0.cil",
     bottom_half: [":30.0.board.compat.map"],
-    // top_half: "product_31.0.cil",
+    top_half: "product_31.0.cil",
+    product_specific: true,
+}
+
+se_cil_compat_map {
+    name: "product_31.0.cil",
+    stem: "31.0.cil",
+    bottom_half: [":31.0.board.compat.map"],
+    // top_half: "product_32.0.cil",
     product_specific: true,
 }
 
@@ -291,20 +335,40 @@ se_cil_compat_map {
 se_cil_compat_map {
     name: "30.0.ignore.cil",
     bottom_half: [":30.0.board.ignore.map"],
-    // top_half: "31.0.ignore.cil",
+    top_half: "31.0.ignore.cil",
+}
+
+se_cil_compat_map {
+    name: "31.0.ignore.cil",
+    bottom_half: [":31.0.board.ignore.map"],
+    // top_half: "32.0.ignore.cil",
 }
 
 se_cil_compat_map {
     name: "system_ext_30.0.ignore.cil",
     bottom_half: [":30.0.board.ignore.map"],
-    // top_half: "system_ext_31.0.ignore.cil",
+    top_half: "system_ext_31.0.ignore.cil",
+    system_ext_specific: true,
+}
+
+se_cil_compat_map {
+    name: "system_ext_31.0.ignore.cil",
+    bottom_half: [":31.0.board.ignore.map"],
+    // top_half: "system_ext_32.0.ignore.cil",
     system_ext_specific: true,
 }
 
 se_cil_compat_map {
     name: "product_30.0.ignore.cil",
     bottom_half: [":30.0.board.ignore.map"],
-    // top_half: "product_31.0.ignore.cil",
+    top_half: "product_31.0.ignore.cil",
+    product_specific: true,
+}
+
+se_cil_compat_map {
+    name: "product_31.0.ignore.cil",
+    bottom_half: [":31.0.board.ignore.map"],
+    // top_half: "product_32.0.ignore.cil",
     product_specific: true,
 }
 
@@ -333,6 +397,11 @@ se_compat_cil {
     srcs: [":30.0.board.compat.cil"],
 }
 
+se_compat_cil {
+    name: "31.0.compat.cil",
+    srcs: [":31.0.board.compat.cil"],
+}
+
 se_compat_cil {
     name: "system_ext_26.0.compat.cil",
     srcs: [":26.0.board.compat.cil"],
@@ -368,6 +437,13 @@ se_compat_cil {
     system_ext_specific: true,
 }
 
+se_compat_cil {
+    name: "system_ext_31.0.compat.cil",
+    srcs: [":31.0.board.compat.cil"],
+    stem: "31.0.compat.cil",
+    system_ext_specific: true,
+}
+
 se_filegroup {
     name: "file_contexts_files",
     srcs: ["file_contexts"],

Android.mk

@@ -1517,6 +1517,8 @@ version_under_treble_tests := 29.0
 include $(LOCAL_PATH)/treble_sepolicy_tests_for_release.mk
 version_under_treble_tests := 30.0
 include $(LOCAL_PATH)/treble_sepolicy_tests_for_release.mk
+version_under_treble_tests := 31.0
+include $(LOCAL_PATH)/treble_sepolicy_tests_for_release.mk
 endif  # PRODUCT_SEPOLICY_SPLIT
 
 version_under_treble_tests := 26.0
@@ -1529,6 +1531,8 @@ version_under_treble_tests := 29.0
 include $(LOCAL_PATH)/compat.mk
 version_under_treble_tests := 30.0
 include $(LOCAL_PATH)/compat.mk
+version_under_treble_tests := 31.0
+include $(LOCAL_PATH)/compat.mk
 
 base_plat_policy.conf :=
 base_plat_pub_policy.conf :=

prebuilts/api/31.0/vendor_sepolicy.cil

@@ -0,0 +1 @@
+;; empty stub

private/compat/31.0/31.0.compat.cil

@@ -0,0 +1 @@
+;; This file can't be empty.

private/compat/31.0/31.0.ignore.cil

@@ -0,0 +1,11 @@
+;; new_objects - a collection of types that have been introduced that have no
+;;   analogue in older policy.  Thus, we do not need to map these types to
+;;   previous ones.  Add here to pass checkapi tests.
+(type new_objects)
+(typeattribute new_objects)
+(typeattributeset new_objects
+  ( new_objects
+    artd_service
+    power_stats_service
+    transformer_service
+  ))