HiKey/HiKey960: Set PRODUCT_SHIPPING_LEVEL to 29 am: 57251741dd am: 5e15e1da55
am: 46167f8a1a
Change-Id: I94ed1dff69dff1e0cca6bc525ac34057c40c1a4e
diff --git a/device-common.mk b/device-common.mk
index 3ab61c8..9867d63 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -29,18 +29,9 @@
# Set vendor kernel path
PRODUCT_VENDOR_KERNEL_HEADERS := device/linaro/hikey/kernel-headers
-# Hikey was first supported from Marshmallow 6.0, API level 23
-# PRODUCT_SHIPPING_API_LEVEL is required from Pie build by the CTS test of
-# CtsOsTestCases android.os.cts.BuildTest#testSdkInt
-# as reported here:
-# https://bugs.linaro.org/show_bug.cgi?id=4068
-# https://source.android.com/setup/start/build-numbers
-# Here we set it to 25 first, because Gatekeeper function
-# needs to be supported when set to 26 or above,
-# which we could not boot successfully with the default implementation
-# enabled yet. Will back to set it to the latest number when we have
-# all necessary features supported.
-PRODUCT_SHIPPING_API_LEVEL := 25
+PRODUCT_SHIPPING_API_LEVEL := 29
+PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
+
# Set custom settings
DEVICE_PACKAGE_OVERLAYS := device/linaro/hikey/overlay
diff --git a/manifest.xml b/manifest.xml
index 2ba519e..c6b7a22 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device">
+<manifest version="1.0" type="device" target-level="2">
<hal format="hidl">
<name>android.hardware.audio</name>
<transport>hwbinder</transport>