Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47de3137 authored by Matt Mower's avatar Matt Mower Committed by Arne Coucheron
Browse files

Revert "build: Enable custom ccache cache dir for Android" 

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 d99981e6.

Change-Id: Ic7b36a6d61269647aec022a86570cfa2068f65d7
parent 18ebbb62

core/ccache.mk

+0 −6
Original line number Diff line number Diff line
@@ -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

envsetup.sh

+0 −4
Original line number Diff line number Diff line
@@ -276,10 +276,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