DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I11a15296360fd68485402e33814e7e756925c6a8

Android.mk

@@ -12,7 +12,7 @@ include $(LOCAL_PATH)/definitions.mk
 # is made which breaks compatibility with the previous platform sepolicy version,
 # not just on every increase in PLATFORM_SDK_VERSION.  The minor version should
 # be reset to 0 on every bump of the PLATFORM_SDK_VERSION.
-sepolicy_major_vers := 26
+sepolicy_major_vers := 27
 sepolicy_minor_vers := 0
 
 ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))

prebuilts/api/26.0/26.0.ignore.cil

+;; 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.
+(typeattribute new_objects)
+(typeattributeset new_objects (kmsg_debug_device))

private/compat/26.0/26.0.ignore.cil

@@ -16,6 +16,9 @@
     hal_wifi_offload_hwservice
     kmsg_debug_device
     last_boot_reason_prop
+    mediaprovider_tmpfs
+    netd_stable_secret_prop
+    package_native_service
     lowpan_device
     lowpan_prop
     lowpan_service

public/te_macros

@@ -476,6 +476,12 @@ define(`not_full_treble', ifelse(target_full_treble, `true', , $1))
 #
 define(`userdebug_or_eng', ifelse(target_build_variant, `eng', $1, ifelse(target_build_variant, `userdebug', $1)))
 
+#####################################
+# User builds
+# SELinux rules which apply only to user builds
+#
+define(`userbuild', ifelse(target_build_variant, `user', $1, ))
+
 #####################################
 # asan builds
 # SELinux rules which apply only to asan builds

tools/sepolicy-analyze/Android.mk

@@ -10,6 +10,6 @@ LOCAL_SRC_FILES := sepolicy-analyze.c dups.c neverallow.c perm.c typecmp.c boole
 LOCAL_STATIC_LIBRARIES := libsepol
 LOCAL_CXX_STL := none
 
-LOCAL_COMPATIBILITY_SUITE := ats cts gts
+LOCAL_COMPATIBILITY_SUITE := cts gts vts
 
 include $(BUILD_HOST_EXECUTABLE)