shipping level 31, and keep target-level as-is
PRODUCT_SHIPPING_API_LEVEL := 31
kernel target-level="6"
target-level="3" or ="4"
Bug: 167997902
Change-Id: I110e251a108bbca7b63cd90142c82b35e93287b7
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index c2631de..607e56f 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -407,3 +407,6 @@
# Enable larger logbuf
BOARD_KERNEL_CMDLINE += log_buf_len=1024K
+
+# Temporarily ignore the vendor selinux context namespace problem for PRODUCT_SHIPPING_API_LEVEL 31
+BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE := true
diff --git a/device.mk b/device.mk
index 833a2e3..0f5df2f 100644
--- a/device.mk
+++ b/device.mk
@@ -159,11 +159,7 @@
DEVICE_PACKAGE_OVERLAYS += device/google/gs101/overlay
# This will be updated to 31 (Android S) for shipping
-PRODUCT_SHIPPING_API_LEVEL := 30
-
-# Do not enforce the kernel requirement temporarily since it is not ready
-# Eventually this configuration should be removed
-PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
+PRODUCT_SHIPPING_API_LEVEL := 31
# Enforce the Product interface
PRODUCT_PRODUCT_VNDK_VERSION := current