summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/combo/select.mk6
-rw-r--r--envsetup.sh4
2 files changed, 10 insertions, 0 deletions
diff --git a/core/combo/select.mk b/core/combo/select.mk
index 5842705..7c80c5f 100644
--- a/core/combo/select.mk
+++ b/core/combo/select.mk
@@ -88,7 +88,13 @@ ifneq ($(USE_CCACHE),)
ifndef CXX_WRAPPER
CXX_WRAPPER := $(ccache)
endif
+ ifeq ($(ANDROID_CCACHE_DIR), $(CCACHE_DIR))
+ ifneq ($(ANDROID_CCACHE_SIZE),)
+ ACCSIZE_RESULT := $(shell $(ccache) -M$(ANDROID_CCACHE_SIZE))
+ endif
+ endif
ccache =
+ ACCSIZE_RESULT =
endif
endif
diff --git a/envsetup.sh b/envsetup.sh
index f8b13b0..3605a59 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -235,6 +235,10 @@ function setpaths()
unset ANDROID_HOST_OUT
export ANDROID_HOST_OUT=$(get_abs_build_var HOST_OUT)
+ if [ -n "$ANDROID_CCACHE_DIR" ]; then
+ export CCACHE_DIR=$ANDROID_CCACHE_DIR
+ fi
+
# needed for building linux on MacOS
# TODO: fix the path
#export HOST_EXTRACFLAGS="-I "$T/system/kernel_headers/host_include