Skip to content

Commit

Permalink
Revert "build: Enable custom ccache cache dir for Android"
Browse files Browse the repository at this point in the history
Developers can specify ccache parameters by sourcing a personal build
environment script before envsetup. For example:

  CMHOME=$HOME/android/cm
  export USE_CCACHE=1
  export CCACHE_DIR=$CMHOME/.ccache
  $CMHOME/prebuilts/misc/linux-x86/ccache/ccache -M50G
  # Maybe someday, currently not supported in ccache 3.1.x
  # echo "max_size = 50G" > "$CCACHE_DIR/ccache.conf"

This reverts commit d99981e6f2576d5fcce8bc5f6255407184b2de16.

Change-Id: Ic7b36a6d61269647aec022a86570cfa2068f65d7
  • Loading branch information
mdmower authored and PRJosh committed Jan 17, 2017
1 parent 975c8c9 commit aa03fac
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
6 changes: 0 additions & 6 deletions core/ccache.mk
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,6 @@ ifneq ($(filter-out false,$(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
4 changes: 0 additions & 4 deletions envsetup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,6 @@ 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
Expand Down

0 comments on commit aa03fac

Please sign in to comment.