diff options
| author | mikaelpeltier <mikaelpeltier@google.com> | 2015-01-12 18:20:17 +0100 |
|---|---|---|
| committer | mikaelpeltier <mikaelpeltier@google.com> | 2015-01-12 18:20:17 +0100 |
| commit | 1b357b2e04d9a4dd0b3eeb25ecb3ec1529ca352f (patch) | |
| tree | ddb35dc9adbd412d3551d6b24026b80e47f4c2b7 /jack-tests | |
| parent | b869cb281882e6e84024bce4a11fbd7a23082173 (diff) | |
| download | toolchain_jack-1b357b2e04d9a4dd0b3eeb25ecb3ec1529ca352f.zip toolchain_jack-1b357b2e04d9a4dd0b3eeb25ecb3ec1529ca352f.tar.gz toolchain_jack-1b357b2e04d9a4dd0b3eeb25ecb3ec1529ca352f.tar.bz2 | |
Rename JayceImport by ImportedLibraries
Change-Id: I13b2f2d57b3d2ae0d22cffcad95b2d39eb343c4e
Diffstat (limited to 'jack-tests')
| -rw-r--r-- | jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java | 8 | ||||
| -rw-r--r-- | jack-tests/tests/com/android/jack/multidex/MultiDexTests.java | 4 |
2 files changed, 6 insertions, 6 deletions
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 d00c345..8aca425 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java +++ b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java @@ -73,7 +73,7 @@ public class JackApiToolchain extends JackBasedToolchain { jackOptions.setOutputDir(out); } - jackOptions.setJayceImports(staticLibs); + jackOptions.setImportedLibraries(staticLibs); jackOptions.setJarjarRulesFile(jarjarRules); @@ -120,7 +120,7 @@ public class JackApiToolchain extends JackBasedToolchain { jackOptions.addResource(res); } - jackOptions.setJayceImports(staticLibs); + jackOptions.setImportedLibraries(staticLibs); jackOptions.setJarjarRulesFile(jarjarRules); @@ -164,7 +164,7 @@ public class JackApiToolchain extends JackBasedToolchain { List<File> libsToImport = new ArrayList<File>(); libsToImport.add(in); libsToImport.addAll(staticLibs); - jackOptions.setJayceImports(libsToImport); + jackOptions.setImportedLibraries(libsToImport); for (File res : resImport) { jackOptions.addResource(res); @@ -212,7 +212,7 @@ public class JackApiToolchain extends JackBasedToolchain { libsToImport.add(staticLib); } libsToImport.addAll(staticLibs); - jackOptions.setJayceImports(libsToImport); + jackOptions.setImportedLibraries(libsToImport); if (zipFiles) { jackOptions.setJayceOutputZip(out); diff --git a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java index 8240cad..fcd0ee1 100644 --- a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java +++ b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java @@ -450,7 +450,7 @@ public class MultiDexTests { Options app1Options = addCommonOptionsForMultiDex( new File(testFolder,"config-001.jpp")); app1Options.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex"); - app1Options.addJayceImport(library); + app1Options.addImportedLibrary(library); TestTools.compileSourceToDex(app1Options, testFolder, TestTools.getDefaultClasspathString() + File.pathSeparator + frameworks.getPath(), @@ -482,7 +482,7 @@ public class MultiDexTests { Options app1Options = new Options(); app1Options.addProperty(MultiDexLegacy.MULTIDEX_LEGACY.getName(), "true"); app1Options.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex"); - app1Options.addJayceImport(autoLibrary); + app1Options.addImportedLibrary(autoLibrary); TestTools.compileSourceToDex(app1Options, testFolder, TestTools.getDefaultClasspathString() + File.pathSeparator + frameworks.getPath(), |