diff options
author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-02-03 17:01:29 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-03 17:01:29 +0000 |
commit | 78af31820dbb4dc8f6abef7b06ff1ca2fd0839b2 (patch) | |
tree | 7dd3c8f02d33da50bd54046b69e09965b7c63397 | |
parent | 3b4c082df068095c3e16651d67f93ad201684eb1 (diff) | |
parent | cfe5dbf2e98f379649a1f44ca7411569eff8778f (diff) | |
download | toolchain_jack-78af31820dbb4dc8f6abef7b06ff1ca2fd0839b2.zip toolchain_jack-78af31820dbb4dc8f6abef7b06ff1ca2fd0839b2.tar.gz toolchain_jack-78af31820dbb4dc8f6abef7b06ff1ca2fd0839b2.tar.bz2 |
Merge "Fix misnamed variable in Dalvik host test runner" into ub-jack
-rw-r--r-- | jack-tests/src/com/android/jack/test/runner/DalvikRunnerHost.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/jack-tests/src/com/android/jack/test/runner/DalvikRunnerHost.java b/jack-tests/src/com/android/jack/test/runner/DalvikRunnerHost.java index 3a6d469..b188609 100644 --- a/jack-tests/src/com/android/jack/test/runner/DalvikRunnerHost.java +++ b/jack-tests/src/com/android/jack/test/runner/DalvikRunnerHost.java @@ -30,6 +30,9 @@ public class DalvikRunnerHost extends HostRunner implements DalvikRunner { @Nonnull private DalvikMode mode = DalvikMode.FAST; + @Nonnull + private static final String ANDROID_ROOT = "ANDROID_ROOT"; + public DalvikRunnerHost(@Nonnull File rtEnvironmentRootDir) { super(rtEnvironmentRootDir); } @@ -40,14 +43,14 @@ public class DalvikRunnerHost extends HostRunner implements DalvikRunner { throws RuntimeRunnerException { return runOnHost( buildCommandLineJUnit(options, jUnitRunnerName, jUnitTestClasses, classpathFiles), - "ANDROID_ROOT"); + ANDROID_ROOT); } @Override public int run(@Nonnull String[] options, @Nonnull String mainClass, @Nonnull File... classpathFiles) throws RuntimeRunnerException { return runOnHost(buildCommandLine(options, mainClass, classpathFiles), - "ANDROID_HOST_OUT"); + ANDROID_ROOT); } @Nonnull |