commit 9b0e5bc91bd1caabee0b7ed36bf69c57513e9f0c
author Jack <jackeagle102@gmail.com> Wed Oct 30 18:32:50 2019 +0530
committer Gerrit Code Review <gerrit2@LegacyServer> Wed Oct 30 18:32:50 2019 +0530
tree 078088066af5b3d764db3c01a6d9127ce3b33d30
parent 735495c98f499f347018a509488d55a7cc5eaedd
parent 64f0c285cf32321a4048685b2c0bd54c08c21e62

Merge "vendor: Update prebuilt apps" into q10

config/BoardConfigKernel.mk

diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk
index 97e6e86..105fe6b 100644
--- a/config/BoardConfigKernel.mk
+++ b/config/BoardConfigKernel.mk
@@ -82,9 +82,13 @@
 KERNEL_TOOLCHAIN_PATH_gcc := $(KERNEL_TOOLCHAIN_$(KERNEL_ARCH))/$(KERNEL_TOOLCHAIN_PREFIX_$(KERNEL_ARCH))
 
 ifneq ($(USE_CCACHE),)
-    ifneq ($(CCACHE_EXEC),)
-        # Android 10+ deprecates use of a build ccache. Only system installed ones are now allowed
-        CCACHE_BIN := $(CCACHE_EXEC)
+    ifeq ($(USE_SYSTEM_CCACHE),)
+        CCACHE_BIN := $(BUILD_TOP)/prebuilts/tools-extras/$(HOST_PREBUILT_TAG)/bin/ccache
+        # Check that the executable is here.
+        CCACHE_BIN := $(strip $(wildcard $(ccache)))
+    else
+        # Detect if the system already has ccache installed to use instead of the prebuilt
+        CCACHE_BIN := $(shell which ccache)
     endif
 endif