commit eb12847b332831e31a3cf7e2f89bd10fd626d7d5
author Ying Wang <wangying@android.com> Mon Jun 23 22:44:38 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 23 21:56:07 2014 +0000
tree d23911fb5451c69f8c20d2a9847aaf9af8d5204c
parent c04b4455689280fad51d48a5587fd93aa8980d01
parent 074151bdf3543f354cf5fd97fa4e370491f55424

Merge "Switch another reference from core to core-libart"

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 9689cce..4791579 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -58,7 +58,6 @@
         echo "Couldn't locate the top of the tree.  Try setting TOP." >&2
         return
     fi
-    CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core \
         TARGET_PRODUCT=$1 \
         TARGET_BUILD_VARIANT= \
         TARGET_BUILD_TYPE= \
@@ -996,6 +995,9 @@
        local EXE="$1"
        if [ "$EXE" ] ; then
            EXE=$1
+           if [[ $EXE =~ ^[^/].* ]] ; then
+               EXE="system/bin/"$EXE
+           fi
        else
            EXE="app_process"
        fi