HiKey/HiKey960: Set PRODUCT_SHIPPING_LEVEL to 29
Set PRODUCT_SHIPPING_LEVEL to 29 and explictly set
the FCM version to 2.
Probably need to bump the FCM to 4 eventually.
NOTE: This patch is dependent on gatekeeper implementation
being present!
Change-Id: Id38404ea42b8bc02f29a8e56a873061aec4e40dd
Signed-off-by: John Stultz <john.stultz@linaro.org>
diff --git a/device-common.mk b/device-common.mk
index 009cd70..0c8c457 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