diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2014-12-23 11:06:55 +0100 |
|---|---|---|
| committer | Jean-Marie Henaff <jmhenaff@google.com> | 2014-12-23 14:56:41 +0100 |
| commit | 695c9c2c96b668f22e922be5532bbf328c53c97d (patch) | |
| tree | 104e73c8c4f4edd47fe63239507cb2edf9b35f87 /jack-tests/tests/com/android/jack/resource/ResourceTests.java | |
| parent | 235db9d956408fc4c9a2bb40268e5a03c163ed78 (diff) | |
| download | toolchain_jack-695c9c2c96b668f22e922be5532bbf328c53c97d.tar.gz toolchain_jack-695c9c2c96b668f22e922be5532bbf328c53c97d.tar.bz2 toolchain_jack-695c9c2c96b668f22e922be5532bbf328c53c97d.zip | |
Tests: use toolchain specific extensions for library names
Change-Id: Ia575e793984349a4e64d2a2bbba6bec5abe6a5be
Diffstat (limited to 'jack-tests/tests/com/android/jack/resource/ResourceTests.java')
| -rw-r--r-- | jack-tests/tests/com/android/jack/resource/ResourceTests.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/jack-tests/tests/com/android/jack/resource/ResourceTests.java b/jack-tests/tests/com/android/jack/resource/ResourceTests.java index f7bcf913..fa31289c 100644 --- a/jack-tests/tests/com/android/jack/resource/ResourceTests.java +++ b/jack-tests/tests/com/android/jack/resource/ResourceTests.java @@ -139,8 +139,9 @@ public class ResourceTests { File jackAr = createJackArchiveWithResources(); // run shrobbing from Jack archive to Jack archive - File shrobbedJackAr = AbstractTestTools.createTempFile("shrobbedJackAr", ".zip"); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); + File shrobbedJackAr = + AbstractTestTools.createTempFile("shrobbedJackAr", toolchain.getLibraryExtension()); toolchain.addProguardFlags(new File(FILE, "proguard.flags")); toolchain.libToLib(jackAr, shrobbedJackAr, /* zipFiles = */ true); @@ -165,8 +166,9 @@ public class ResourceTests { FILE); // run shrobbing from Jack dir to Jack archive - File shrobbedJackAr = AbstractTestTools.createTempFile("shrobbedJackAr", ".zip"); toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); + File shrobbedJackAr = + AbstractTestTools.createTempFile("shrobbedJackAr", toolchain.getLibraryExtension()); toolchain.addProguardFlags(new File(FILE, "proguard.flags")); toolchain.libToLib(jackFolder, shrobbedJackAr, /* zipFiles = */ true); @@ -309,8 +311,8 @@ public class ResourceTests { @Nonnull private File createJackArchiveWithResources() throws Exception { // compile source file to a Jack file - File jackAr = AbstractTestTools.createTempFile("resourcetestjack", ".zip"); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); + File jackAr = AbstractTestTools.createTempFile("resourcetestjack", toolchain.getLibraryExtension()); toolchain.addResource(new File(FILE, "rsc")); toolchain.srcToLib( AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), |