diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-04-24 12:41:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-24 12:41:29 +0000 |
| commit | 69f8fc656f04661f9c32176ebfd093e42bae53d4 (patch) | |
| tree | 891816542c862ce37b69b4e8f5e7d4c6f95595bd | |
| parent | 2b7e589a8ea095392e97d45f1feb04832bada21c (diff) | |
| parent | 54d3b9369fe3d02ce573acdc703b694e7292704e (diff) | |
| download | libcore-69f8fc656f04661f9c32176ebfd093e42bae53d4.zip libcore-69f8fc656f04661f9c32176ebfd093e42bae53d4.tar.gz libcore-69f8fc656f04661f9c32176ebfd093e42bae53d4.tar.bz2 | |
Merge "Use ANDROID_ROOT instead of assuming it is /system."
| -rw-r--r-- | luni/src/test/java/libcore/java/lang/ProcessBuilderTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/luni/src/test/java/libcore/java/lang/ProcessBuilderTest.java b/luni/src/test/java/libcore/java/lang/ProcessBuilderTest.java index 9766cef..51aed38 100644 --- a/luni/src/test/java/libcore/java/lang/ProcessBuilderTest.java +++ b/luni/src/test/java/libcore/java/lang/ProcessBuilderTest.java @@ -28,7 +28,7 @@ import static tests.support.Support_Exec.execAndCheckOutput; public class ProcessBuilderTest extends AbstractResourceLeakageDetectorTestCase { private static String shell() { - String deviceSh = "/system/bin/sh"; + String deviceSh = System.getenv("ANDROID_ROOT") + "/bin/sh"; String desktopSh = "/bin/sh"; return new File(deviceSh).exists() ? deviceSh : desktopSh; } |