diff options
| author | Mikael Peltier <mikaelpeltier@google.com> | 2015-04-28 14:14:38 +0000 |
|---|---|---|
| committer | Mikael Peltier <mikaelpeltier@google.com> | 2015-04-28 14:14:38 +0000 |
| commit | 16f26e6be0d9ea48d4a3e517ad8f42ee7ee5fefc (patch) | |
| tree | 62310815cf4f05432e5217af1b6e0e2b042f9fe1 /jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java | |
| parent | 88ac57db8ef6442d2a87aacad089104b488052e0 (diff) | |
| download | toolchain_jack-16f26e6be0d9ea48d4a3e517ad8f42ee7ee5fefc.tar.gz toolchain_jack-16f26e6be0d9ea48d4a3e517ad8f42ee7ee5fefc.tar.bz2 toolchain_jack-16f26e6be0d9ea48d4a3e517ad8f42ee7ee5fefc.zip | |
Revert "During shrinking generate error if they are unknow types"
This reverts commit 88ac57db8ef6442d2a87aacad089104b488052e0.
Change-Id: I67a420bcc60bf0ccbea0af30a551e3326d18e420
Diffstat (limited to 'jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java')
| -rw-r--r-- | jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java index a31cc2ca..44128a9d 100644 --- a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java +++ b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java @@ -577,8 +577,6 @@ public class FileConflictTests { toolchain = getToolchain(isApiTest); toolchain.addProguardFlags(new File(TEST001_DIR, "proguard.flags")); toolchain.addStaticLibs(jackImport1, jackImport2); - toolchain.addToClasspath(toolchain.getDefaultBootClasspath()); - if (collisionPolicy != null) { toolchain.addProperty(JayceFileImporter.COLLISION_POLICY.getName(), collisionPolicy); } |