commit 9e85d55c085504b88a9ac68c3f9605629dc06853
author Nicolas Geoffray <ngeoffray@google.com> Fri Apr 24 12:45:28 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 24 12:45:28 2015 +0000
tree 1f43ed0b6e64425ed254138a50b75dc5b6795ff3
parent 11307fd2943663bd7daa85428a104374e6d3e784
parent 06801ffe75b02ed8e79c28f604cfe4694465a8bc

Merge "Use 'sh' explicitly when invoking the art script."

runtime/utils_test.cc

diff --git a/runtime/utils_test.cc b/runtime/utils_test.cc
index ae24b77..d8f8950 100644
--- a/runtime/utils_test.cc
+++ b/runtime/utils_test.cc
@@ -384,7 +384,8 @@
 TEST_F(UtilsTest, ExecSuccess) {
   std::vector<std::string> command;
   if (kIsTargetBuild) {
-    command.push_back("/system/bin/id");
+    std::string android_root(GetAndroidRoot());
+    command.push_back(android_root + "/bin/id");
   } else {
     command.push_back("/usr/bin/id");
   }

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 8dd7573..1c44958 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -364,6 +364,7 @@
              export ANDROID_ROOT=$ANDROID_ROOT && \
              $mkdir_cmdline && \
              export LD_LIBRARY_PATH=$LD_LIBRARY_PATH && \
+             export PATH=$ANDROID_ROOT/bin:$PATH && \
              $dex2oat_cmdline && \
              $dalvikvm_cmdline"
 

tools/art

diff --git a/tools/art b/tools/art
index 6c89a60..85e6e2f 100644
--- a/tools/art
+++ b/tools/art
@@ -92,6 +92,7 @@
 ANDROID_DATA=$ANDROID_DATA \
   ANDROID_ROOT=$ANDROID_ROOT \
   LD_LIBRARY_PATH=$LD_LIBRARY_PATH \
+  PATH=$ANDROID_ROOT/bin:$PATH \
   $invoke_with $ANDROID_ROOT/bin/$DALVIKVM $lib \
     -XXlib:$LIBART \
     -Ximage:$ANDROID_ROOT/framework/core.art \