diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-02-24 17:11:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-24 17:11:10 +0000 |
| commit | d2d5ea94e4b4f010366b53f3ea5808a104888f41 (patch) | |
| tree | cf7a2016c8368628ebf8dda7c4746f90bb1b627f /jack-tests | |
| parent | 5eeb237a8fd7d80ee01aa8111870731ffe6f0188 (diff) | |
| parent | 9888b353523d81ee6daa3df752b8ddf89df3e57e (diff) | |
| download | toolchain_jack-d2d5ea94e4b4f010366b53f3ea5808a104888f41.zip toolchain_jack-d2d5ea94e4b4f010366b53f3ea5808a104888f41.tar.gz toolchain_jack-d2d5ea94e4b4f010366b53f3ea5808a104888f41.tar.bz2 | |
Merge "Remove some Findbugs warnings in test framework sources" into ub-jack
Diffstat (limited to 'jack-tests')
| -rw-r--r-- | jack-tests/src/com/android/jack/test/runtime/RuntimeTest.java | 1 | ||||
| -rw-r--r-- | jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/jack-tests/src/com/android/jack/test/runtime/RuntimeTest.java b/jack-tests/src/com/android/jack/test/runtime/RuntimeTest.java index d1d2076..4278cd7 100644 --- a/jack-tests/src/com/android/jack/test/runtime/RuntimeTest.java +++ b/jack-tests/src/com/android/jack/test/runtime/RuntimeTest.java @@ -37,6 +37,7 @@ public abstract class RuntimeTest { rtTestInfos = new ArrayList<RuntimeTestInfo>(); fillRtTestInfos(); } + assert rtTestInfos != null; return rtTestInfos; } diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java index 8881bd6..05a17de 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java +++ b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java @@ -118,7 +118,9 @@ public class JackApiToolchain extends JackBasedToolchain { jackOptions.setImportedLibraries(staticLibs); - jackOptions.setJarjarRulesFile(jarjarRules); + if (jarjarRules != null) { + jackOptions.setJarjarRulesFile(jarjarRules); + } if (proguardFlags.size() > 0) { jackOptions.setProguardFlagsFile(proguardFlags); @@ -183,7 +185,9 @@ public class JackApiToolchain extends JackBasedToolchain { jackOptions.setSanityChecks(sanityChecks); - jackOptions.setJarjarRulesFile(jarjarRules); + if (jarjarRules != null) { + jackOptions.setJarjarRulesFile(jarjarRules); + } if (classpath.size() > 0) { jackOptions.setClasspath(getClasspathAsString()); |