commit 16a29d84fa67b49a128e1d0ff4b08d7d4d343b52
author Andrew Lehmer <alehmer@google.com> Tue May 14 21:18:53 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 14 21:18:53 2019 +0000
tree 8b0a7cce88a0dc8132f61f19dd4f8b9ad275f70b
parent 23a08f7dc54236307a4faf16d789ebef84e09906
parent 866339e3897fc90b75180c07690cfa5825301f5d

Merge "Revert "Remove USE_XML_AUDIO_POLICY_CONF build flag""

hikey-common.mk

diff --git a/hikey-common.mk b/hikey-common.mk
index 77ea15b..a2cb460 100644
--- a/hikey-common.mk
+++ b/hikey-common.mk
@@ -1,5 +1,5 @@
 ifndef TARGET_KERNEL_USE
-TARGET_KERNEL_USE=4.14
+TARGET_KERNEL_USE=4.19
 endif
 
 HIKEY_USE_DRM_HWCOMPOSER := false

hikey960/device-hikey960.mk

diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk
index 2695698..9bde93b 100644
--- a/hikey960/device-hikey960.mk
+++ b/hikey960/device-hikey960.mk
@@ -54,6 +54,8 @@
 			libRSDriverArm.so \
 			libmalicore.bc \
 			END_USER_LICENCE_AGREEMENT.txt
+
+ifdef $(MALI_RS_DRIVER_AVAILABLE)
 PRODUCT_COPY_FILES += \
         $(LOCAL_PATH)/../mali/bifrost/lib/libclcore.bc:vendor/lib/libclcore.bc \
         $(LOCAL_PATH)/../mali/bifrost/lib/libclcore_neon.bc:vendor/lib/libclcore_neon.bc \
@@ -61,7 +63,7 @@
         $(LOCAL_PATH)/../mali/bifrost/lib64/libbcc.so:vendor/lib64/libbcc.so \
         $(LOCAL_PATH)/../mali/bifrost/lib64/libclcore.bc:vendor/lib64/libclcore.bc \
         $(LOCAL_PATH)/../mali/bifrost/lib64/libLLVM.so:vendor/lib64/libLLVM.so
-
+endif
 
 OVERRIDE_RS_DRIVER := libRSDriverArm.so
 PRODUCT_PACKAGES += android.hardware.renderscript@1.0-impl