From b70acae117c40df87181fd0107b24b610d1737c5 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Tue, 8 May 2012 08:07:42 +0800 Subject: Fixed standalone emulator when ANDROID_BUILD_TOP is present With ANDROID_BUILD_TOP android-configure.sh searches for prebuilt directories later used for locating ccache. At this moment, ccache is located in different location between AOSP and internal tree. Beside, "prebuilt" is gone in internal tree. Change-Id: Ib14b8c91c9f8026605617f2abf94c3bee9ddadb6 --- android-configure.sh | 6 ------ 1 file changed, 6 deletions(-) (limited to 'android-configure.sh') diff --git a/android-configure.sh b/android-configure.sh index beb7427..01fc2c4 100755 --- a/android-configure.sh +++ b/android-configure.sh @@ -196,15 +196,9 @@ if [ "$IN_ANDROID_BUILD" = "yes" ] ; then # use ccache if USE_CCACHE is defined and the corresponding # binary is available. # - # note: located in PREBUILT/ccache/ccache in the new tree layout - # located in PREBUILT/ccache in the old one - # if [ -n "$USE_CCACHE" ] ; then CCACHE="$ANDROID_PREBUILT/ccache/ccache$EXE" if [ ! -f $CCACHE ] ; then - CCACHE="$ANDROID_PREBUILT/ccache$EXE" - fi - if [ ! -f $CCACHE ] ; then CCACHE="$ANDROID_PREBUILTS/ccache/ccache$EXE" fi if [ -f $CCACHE ] ; then -- cgit v1.1