Merge "Disable goma/ccache with USE_XXX=false" am: 6c90e49f4a

am: f2f5294cb1

* commit 'f2f5294cb1775a07b94d8b197deee6c17388a8fc':
  Disable goma/ccache with USE_XXX=false
This commit is contained in:
Shinichiro Hamaji 2015-12-21 05:53:22 +00:00 committed by android-build-merger
commit 800ae1674b
2 changed files with 2 additions and 2 deletions

View file

@ -14,7 +14,7 @@
# limitations under the License.
#
ifneq ($(USE_CCACHE),)
ifneq ($(filter-out false,$(USE_CCACHE)),)
# The default check uses size and modification time, causing false misses
# since the mtime depends when the repo was checked out
export CCACHE_COMPILERCHECK := content

View file

@ -15,7 +15,7 @@
#
# Notice: this works only with Google's Goma build infrastructure.
ifneq ($(USE_GOMA),)
ifneq ($(filter-out false,$(USE_GOMA)),)
# Check if USE_NINJA is not false because GNU make won't work well
# with goma. Note this file is evaluated twice, once by GNU make and
# once by kati with USE_NINJA=false. We do this check in the former