From c2db2b6accc7888df514261a7240e7759df95a4c Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Fri, 9 Jan 2009 17:51:21 -0800
Subject: auto import from //branches/cupcake/...@125939

---
 android-configure.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'android-configure.sh')

diff --git a/android-configure.sh b/android-configure.sh
index a73b89b..95409c5 100755
--- a/android-configure.sh
+++ b/android-configure.sh
@@ -105,11 +105,11 @@ if [ -n "$ANDROID_PRODUCT_OUT" ] ; then
     log "TOP found at $TOP"
     # $TOP/config/envsetup.make is for the old tree layout
     # $TOP/build/envsetup.sh is for the new one
-    ANDROID_ENVSETUP_MK=$TOP/config/envsetup.make
-    if [ ! -f $ANDROID_ENVSETUP_MK ] ; then
-        ANDROID_ENVSETUP_MK=$TOP/build/core/envsetup.mk
+    ANDROID_CONFIG_MK=$TOP/config/envsetup.make
+    if [ ! -f $ANDROID_CONFIG_MK ] ; then
+        ANDROID_CONFIG_MK=$TOP/build/core/config.mk
     fi
-    if [ ! -f $ANDROID_ENVSETUP_MK ] ; then
+    if [ ! -f $ANDROID_CONFIG_MK ] ; then
         echo "Cannot find build system root (TOP)"
         echo "defaulting to non-Android build"
         unset TOP
@@ -219,8 +219,7 @@ if [ "$IN_ANDROID_BUILD" = "yes" ] ; then
     # Get the value of a build variable as an absolute path.
     function get_abs_build_var()
     {
-       (cd "$TOP" &&
-        CALLED_FROM_SETUP=true make -f $ANDROID_ENVSETUP_MK dumpvar-abs-$1)
+       (cd $TOP && CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core make -f $ANDROID_CONFIG_MK dumpvar-abs-$1)
     }
 
     # locate prebuilt directory
-- 
cgit v1.1