diff options
| author | Alistair Strachan <astrachan@google.com> | 2019-05-17 14:17:11 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-17 14:17:11 -0700 |
| commit | 7a209b27473b1ce16c371334b3be14e8fbf48466 (patch) | |
| tree | 9cd08efee5300a1f64b445892f48807bc2a73c59 | |
| parent | 8ae133500c89309a3c7edc1377598edf9cb29c54 (diff) | |
| parent | 503f5f827e52eb3687de5316890d4cd2ff891e91 (diff) | |
| download | hikey-7a209b27473b1ce16c371334b3be14e8fbf48466.tar.gz | |
Merge "Revert "HiKey/HiKey960: Set PRODUCT_SHIPPING_LEVEL to 29"" am: b0063d541b
am: 503f5f827e
Change-Id: Iecdf2594f3a57bc030e8f1c60584622bfd32576b
| -rw-r--r-- | device-common.mk | 15 | ||||
| -rw-r--r-- | manifest.xml | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/device-common.mk b/device-common.mk index 4d897143..bd46cb01 100644 --- a/device-common.mk +++ b/device-common.mk @@ -29,9 +29,18 @@ endif # Set vendor kernel path PRODUCT_VENDOR_KERNEL_HEADERS := device/linaro/hikey/kernel-headers -PRODUCT_SHIPPING_API_LEVEL := 29 -PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false - +# 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 # Set custom settings DEVICE_PACKAGE_OVERLAYS := device/linaro/hikey/overlay diff --git a/manifest.xml b/manifest.xml index 79a593e1..df9b1558 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,4 +1,4 @@ -<manifest version="1.0" type="device" target-level="2"> +<manifest version="1.0" type="device"> <hal format="hidl"> <name>android.hardware.audio</name> <transport>hwbinder</transport> |