diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2015-10-23 20:23:21 +0300 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-10-27 00:45:16 +0200 |
| commit | d17b74bb8d5db9cab53b39fd56532431bb15d05d (patch) | |
| tree | 66b75b60e473c29748c2ba4b876e3ebd15d303fc /core/ccache.mk | |
| parent | f79641157b5d206d3c7d3c5f8481dbc0915ce484 (diff) | |
| download | build-d17b74bb8d5db9cab53b39fd56532431bb15d05d.zip build-d17b74bb8d5db9cab53b39fd56532431bb15d05d.tar.gz build-d17b74bb8d5db9cab53b39fd56532431bb15d05d.tar.bz2 | |
Fix ccache mismerges
* ccache config has moved to a separate makefile in M
Change-Id: If1f426e647715f72c09f2339a61ac2a13121b477
Diffstat (limited to 'core/ccache.mk')
| -rw-r--r-- | core/ccache.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/ccache.mk b/core/ccache.mk index 34e5e1c..d27f5a5 100644 --- a/core/ccache.mk +++ b/core/ccache.mk @@ -30,7 +30,9 @@ ifneq ($(USE_CCACHE),) # We don't really use system headers much so the rootdir is # fine; ensures these paths are relative for all Android trees # on a workstation. - export CCACHE_BASEDIR := / + ifeq ($(CCACHE_BASEDIR),) + export CCACHE_BASEDIR := $(ANDROID_BUILD_TOP) + endif # Workaround for ccache with clang. # See http://petereisentraut.blogspot.com/2011/09/ccache-and-clang-part-2.html @@ -52,6 +54,12 @@ 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 |