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/withphantom | |
| 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/withphantom')
| -rw-r--r-- | jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java b/jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java index e3918efa..8967a4d5 100644 --- a/jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java +++ b/jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java @@ -77,26 +77,21 @@ public class WithPhantomTests { File tempOut1 = AbstractTestTools.createTempDir(); toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class, exclude); toolchain.addProguardFlags(new ProguardFlags(testFolder, "shrink1.flags")) - .addToClasspath(toolchain.getDefaultBootClasspath()) .libToLib(tempJackFolder, tempOut1, /* zipFiles = */ false); File tempOut2 = AbstractTestTools.createTempDir(); toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class, exclude); - toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) - .addProguardFlags(new ProguardFlags(testFolder, "shrink2.flags")) - + toolchain.addProguardFlags(new ProguardFlags(testFolder, "shrink2.flags")) .libToLib(tempJackFolder, tempOut2, /* zipFiles = */ false); File tempOut3 = AbstractTestTools.createTempDir(); toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class, exclude); toolchain.addProguardFlags(new ProguardFlags(testFolder, "obf1.flags")) - .addToClasspath(toolchain.getDefaultBootClasspath()) .libToLib(tempJackFolder, tempOut3, /* zipFiles = */ false); File tempOut4 = AbstractTestTools.createTempDir(); toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class, exclude); toolchain.addProguardFlags(new ProguardFlags(testFolder, "obf2.flags")) - .addToClasspath(toolchain.getDefaultBootClasspath()) .libToLib(tempJackFolder, tempOut4, /* zipFiles = */ false); File tempOut5 = AbstractTestTools.createTempDir(); @@ -131,25 +126,21 @@ public class WithPhantomTests { File tempOut1 = AbstractTestTools.createTempDir(); toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addProguardFlags(new ProguardFlags(testFolder, "shrink1.flags")) - .addToClasspath(toolchain.getDefaultBootClasspath()) .libToLib(tempJackFolder, tempOut1, /* zipFiles = */ false); File tempOut2 = AbstractTestTools.createTempDir(); toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addProguardFlags(new ProguardFlags(testFolder, "shrink2.flags")) - .addToClasspath(toolchain.getDefaultBootClasspath()) .libToLib(tempJackFolder, tempOut2, /* zipFiles = */ false); File tempOut3 = AbstractTestTools.createTempDir(); toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addProguardFlags(new ProguardFlags(testFolder, "obf1.flags")) - .addToClasspath(toolchain.getDefaultBootClasspath()) .libToLib(tempJackFolder, tempOut3, /* zipFiles = */ false); File tempOut4 = AbstractTestTools.createTempDir(); toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addProguardFlags(new ProguardFlags(testFolder, "obf2.flags")) - .addToClasspath(toolchain.getDefaultBootClasspath()) .libToLib(tempJackFolder, tempOut4, /* zipFiles = */ false); File tempOutFolder = AbstractTestTools.createTempDir(); |