Merge "Revert "Add 29.0 mapping files""

am: 6d47c27458

Change-Id: If5332090c9cf35f4b489e014cc73c295ffb74834

Android.bp

@@ -35,13 +35,6 @@ se_filegroup {
     ],
 }
 
-se_filegroup {
-    name: "29.0.board.compat.map",
-    srcs: [
-        "compat/29.0/29.0.cil",
-    ],
-}
-
 se_filegroup {
     name: "26.0.board.ignore.map",
     srcs: [
@@ -63,13 +56,6 @@ se_filegroup {
     ],
 }
 
-se_filegroup {
-    name: "29.0.board.ignore.map",
-    srcs: [
-        "compat/29.0/29.0.ignore.cil",
-    ],
-}
-
 se_cil_compat_map {
     name: "26.0.cil",
     bottom_half: [":26.0.board.compat.map"],
@@ -85,13 +71,7 @@ se_cil_compat_map {
 se_cil_compat_map {
     name: "28.0.cil",
     bottom_half: [":28.0.board.compat.map"],
-    top_half: "29.0.cil",
+    // top_half: "29.0.cil",
-}
-
-se_cil_compat_map {
-    name: "29.0.cil",
-    bottom_half: [":29.0.board.compat.map"],
-    // top_half: "30.0.cil",
 }
 
 se_cil_compat_map {
@@ -112,15 +92,9 @@ se_cil_compat_map {
     // top_half: "29.0.ignore.cil",
 }
 
-se_cil_compat_map {
-    name: "29.0.ignore.cil",
-    bottom_half: [":29.0.board.ignore.map"],
-    // top_half: "30.0.ignore.cil",
-}
-
 prebuilt_etc {
-    name: "26.0.compat.cil",
+    name: "28.0.compat.cil",
-    src: "private/compat/26.0/26.0.compat.cil",
+    src: "private/compat/28.0/28.0.compat.cil",
     sub_dir: "selinux/mapping",
 }
 
@@ -131,14 +105,8 @@ prebuilt_etc {
 }
 
 prebuilt_etc {
-    name: "28.0.compat.cil",
+    name: "26.0.compat.cil",
-    src: "private/compat/28.0/28.0.compat.cil",
+    src: "private/compat/26.0/26.0.compat.cil",
-    sub_dir: "selinux/mapping",
-}
-
-prebuilt_etc {
-    name: "29.0.compat.cil",
-    src: "private/compat/29.0/29.0.compat.cil",
     sub_dir: "selinux/mapping",
 }
 

Android.mk

@@ -1290,8 +1290,6 @@ version_under_treble_tests := 27.0
 include $(LOCAL_PATH)/treble_sepolicy_tests_for_release.mk
 version_under_treble_tests := 28.0
 include $(LOCAL_PATH)/treble_sepolicy_tests_for_release.mk
-version_under_treble_tests := 29.0
-include $(LOCAL_PATH)/treble_sepolicy_tests_for_release.mk
 
 version_under_treble_tests := 26.0
 include $(LOCAL_PATH)/compat.mk
@@ -1299,8 +1297,6 @@ version_under_treble_tests := 27.0
 include $(LOCAL_PATH)/compat.mk
 version_under_treble_tests := 28.0
 include $(LOCAL_PATH)/compat.mk
-version_under_treble_tests := 29.0
-include $(LOCAL_PATH)/compat.mk
 
 BASE_PLAT_PUBLIC_POLICY :=
 BASE_PLAT_PRIVATE_POLICY :=

prebuilts/api/29.0/vendor_sepolicy.cil

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

private/compat/29.0/29.0.compat.cil

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

private/compat/29.0/29.0.ignore.cil

@@ -1,9 +0,0 @@
-;; 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
-    device_config_sys_traced_prop
-    vendor_apex_file))