diff options
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()); |