commit 7bf9d7ffaee95963a1f6535494eedfc09097271b
author Ying Wang <wangying@android.com> Thu Oct 07 15:12:11 2010 -0700
committer Jean-Baptiste Queru <jbq@google.com> Fri Oct 08 13:21:29 2010 -0700
tree 57873ae2beadf647145f812970e5232e7e580faa
parent 008c97e3652233186d83a5010f69741368ef98db

Don't prepend ccache if it's already there

Bug: 3069576
Change-Id: I8345209c5c885ed7ed8e043e051884d64008961c

Makefile.android

diff --git a/Makefile.android b/Makefile.android
index c057585..c9ed595 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -86,7 +86,11 @@
 ifneq ($(BUILD_STANDALONE_EMULATOR),true)
 
   ifneq ($(USE_CCACHE),)
-    MY_CC := prebuilt/$(HOST_PREBUILT_TAG)/ccache/ccache $(MY_CC)
+    ccache := prebuilt/$(HOST_PREBUILT_TAG)/ccache/ccache
+    ifneq ($(ccache),$(firstword $(MY_CC)))
+      MY_CC := $(ccache) $(MY_CC)
+    endif
+    ccache :=
   endif
 endif