commit 552594b681c7c4f1e5fa7f12f0f4d69ca1a3319c
author Tim Klein <tim.klein@arm.com> Tue May 14 08:46:58 2019 +0100
committer Stephen Hines <srhines@google.com> Mon Jun 03 01:46:40 2019 -0700
tree 00123e5f30cf0e4c667f5b827c5e6a0e7bd1148e
parent c2747e72f9f7d73a406258bfb57936734829f25d

Disable copying of Mali RS driver binaries

This is temporary and required due to conflicts in the names
used by the Mali RS driver binaries and AOSP binaries.

Bug: 131709055
Test: manual
Change-Id: Ia1509cb4d12267f35f1e85e2494628140b2881b8
(cherry picked from commit c85f9bbdd96e03e0532932c0a6954559fd8c11b6)

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