diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-06-23 12:19:31 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-06-23 12:19:31 -0700 |
| commit | 4863f82a20559827c131363e193aefcc4964cc23 (patch) | |
| tree | b62c294bdd8cfad11fad780e3706eed18ef3305d /android/build | |
| parent | c2c7377fbfcbf7cb87329511af1de5be578c6e77 (diff) | |
| parent | 04fcb22aa936b2ca326d6e1e35f97b7afb23a3de (diff) | |
| download | external_qemu-4863f82a20559827c131363e193aefcc4964cc23.zip external_qemu-4863f82a20559827c131363e193aefcc4964cc23.tar.gz external_qemu-4863f82a20559827c131363e193aefcc4964cc23.tar.bz2 | |
Merge "android-configure.sh: Better platform build detection."
Diffstat (limited to 'android/build')
| -rw-r--r-- | android/build/common.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/build/common.sh b/android/build/common.sh index 050fd90..de4e3c1 100644 --- a/android/build/common.sh +++ b/android/build/common.sh @@ -457,11 +457,11 @@ check_android_build () unset ANDROID_TOP IN_ANDROID_BUILD=no - if [ -z "$ANDROID_PRODUCT_OUT" ] ; then + if [ -z "$ANDROID_BUILD_TOP" ] ; then return ; fi - ANDROID_TOP=`cd $ANDROID_PRODUCT_OUT/../../../.. && pwd` + ANDROID_TOP=$ANDROID_BUILD_TOP log "ANDROID_TOP found at $ANDROID_TOP" # $ANDROID_TOP/config/envsetup.make is for the old tree layout # $ANDROID_TOP/build/envsetup.sh is for the new one |