diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-05-08 08:07:42 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-05-08 08:14:51 +0800 |
| commit | b70acae117c40df87181fd0107b24b610d1737c5 (patch) | |
| tree | 8b372da8852d68da74db6e6be0a6869ea525b7b6 /android-configure.sh | |
| parent | 52fb3bade412ef2de0f2222bced2052245cce952 (diff) | |
| download | external_qemu-b70acae117c40df87181fd0107b24b610d1737c5.zip external_qemu-b70acae117c40df87181fd0107b24b610d1737c5.tar.gz external_qemu-b70acae117c40df87181fd0107b24b610d1737c5.tar.bz2 | |
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
Diffstat (limited to 'android-configure.sh')
| -rwxr-xr-x | android-configure.sh | 6 |
1 files changed, 0 insertions, 6 deletions
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 |