commit 929c5f86a276aed03460b1fbf25c49838a26c76e
author Alistair Strachan <astrachan@google.com> Wed Jan 09 11:19:01 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 09 11:19:01 2019 -0800
tree 06df7ce87449bf625b03b7999078bfbc2909280a
parent bd3cfe3fe1a56c63524fd6d11885970990339668
parent 5f861fba96dffa796d5a3f3509c3027f9c66baa3

Merge changes I3cd68e65,I837596e4 am: 01b3b33248
am: 5f861fba96

Change-Id: I17c41cac4ff9aff789614217ca11c7a9c7d88b3b

hikey-common.mk

diff --git a/hikey-common.mk b/hikey-common.mk
index 86909f1..d4b8797 100644
--- a/hikey-common.mk
+++ b/hikey-common.mk
@@ -1,19 +1,11 @@
 
 ifndef TARGET_KERNEL_USE
-TARGET_KERNEL_USE=4.9
-endif
-
-ifndef TARGET_COMPRESSED_KERNEL
-TARGET_COMPRESSED_KERNEL=true
+TARGET_KERNEL_USE=4.14
 endif
 
 HIKEY_USE_DRM_HWCOMPOSER := false
 
-ifeq ($(TARGET_COMPRESSED_KERNEL), false)
-TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/Image-dtb-$(TARGET_KERNEL_USE)
-else
 TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/Image.gz-dtb-$(TARGET_KERNEL_USE)
-endif
 
 TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hi6220-hikey.dtb-$(TARGET_KERNEL_USE)