summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2019-05-15 19:16:24 +0000
committerAlistair Strachan <astrachan@google.com>2019-05-17 20:17:57 +0000
commitcc74a76a21b7e216063305bb1f966213a78aea4e (patch)
tree4846cb4e9b09e7aef53710abfd23fc1d8cb9c04c
parentc6b20e29fe8b25853271205a0004cea036d389f4 (diff)
downloadhikey-cc74a76a21b7e216063305bb1f966213a78aea4e.tar.gz
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. Change-Id: I99ef483351f39217f082c22d2782696caf1a2f44 Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--device-common.mk15
-rw-r--r--manifest.xml2
2 files changed, 4 insertions, 13 deletions
diff --git a/device-common.mk b/device-common.mk
index 0b53f896..6412d140 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -29,18 +29,9 @@ endif
# 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 f45676c6..67d932ba 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>