diff options
7 files changed, 27 insertions, 27 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 d00c345a..8aca4257 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 8240cadd..fcd0ee1d 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(), diff --git a/jack/src/com/android/jack/Options.java b/jack/src/com/android/jack/Options.java index f23b43f0..c81b6a60 100644 --- a/jack/src/com/android/jack/Options.java +++ b/jack/src/com/android/jack/Options.java @@ -244,7 +244,7 @@ public class Options { @Option(name = "--import", usage = "import the given file into the output (repeatable)", metaVar = "FILE") - protected List<File> jayceImport = new ArrayList<File>(); + protected List<File> importedLibraries = new ArrayList<File>(); @Option(name = "--import-resource", usage = "import the given directory into the output as resource files (repeatable)", @@ -770,8 +770,8 @@ public class Options { libraryOutZip = outputZip; } - public void setJayceImports(@Nonnull List<File> imports) { - jayceImport = imports; + public void setImportedLibraries(@Nonnull List<File> importedLibraries) { + this.importedLibraries = importedLibraries; } public boolean outputToZip() { @@ -791,8 +791,8 @@ public class Options { assert flags != null; List<File> inJars = flags.getInJars(); if (inJars.size() > 0) { - jayceImport = new ArrayList<File>(inJars.size()); - jayceImport.addAll(inJars); + importedLibraries = new ArrayList<File>(inJars.size()); + importedLibraries.addAll(inJars); } List<File> outJars = flags.getOutJars(); if (outJars.size() > 0) { @@ -824,8 +824,8 @@ public class Options { proguardFlagsFiles.add(flags); } - public void addJayceImport(@Nonnull File importFile) { - jayceImport.add(importFile); + public void addImportedLibrary(@Nonnull File importedLibrary) { + importedLibraries.add(importedLibrary); } public void addProperty(@Nonnull String propertyName, @Nonnull String propertyValue) { @@ -871,8 +871,8 @@ public class Options { } @Nonnull - public List<File> getJayceImport() { - return jayceImport; + public List<File> getImportedLibraries() { + return importedLibraries; } @CheckForNull diff --git a/jack/src/com/android/jack/incremental/IncrementalInputFilter.java b/jack/src/com/android/jack/incremental/IncrementalInputFilter.java index b86fc092..b4a51309 100644 --- a/jack/src/com/android/jack/incremental/IncrementalInputFilter.java +++ b/jack/src/com/android/jack/incremental/IncrementalInputFilter.java @@ -273,7 +273,7 @@ public class IncrementalInputFilter extends CommonFilter implements InputFilter } } - for (File importedJackFiles : options.getJayceImport()) { + for (File importedJackFiles : options.getImportedLibraries()) { if (isModifiedLibrary(importedJackFiles, timestamp)) { return true; } @@ -452,7 +452,7 @@ public class IncrementalInputFilter extends CommonFilter implements InputFilter if (incrementalInputLibrary == null || needFullRebuild()) { Jack.getSession().setFileDependencies(new FileDependencies()); Jack.getSession().setTypeDependencies(new TypeDependencies()); - return options.getJayceImport(); + return options.getImportedLibraries(); } try { @@ -462,7 +462,7 @@ public class IncrementalInputFilter extends CommonFilter implements InputFilter throw new JackAbortException(e); } - List<File> importedJackLibrary = new ArrayList<File>(options.getJayceImport()); + List<File> importedJackLibrary = new ArrayList<File>(options.getImportedLibraries()); importedJackLibrary.add(options.getIncrementalFolder()); return importedJackLibrary; } diff --git a/jack/src/com/android/jack/incremental/NoInputFilter.java b/jack/src/com/android/jack/incremental/NoInputFilter.java index a6826da5..78c3701d 100644 --- a/jack/src/com/android/jack/incremental/NoInputFilter.java +++ b/jack/src/com/android/jack/incremental/NoInputFilter.java @@ -62,6 +62,6 @@ public class NoInputFilter extends CommonFilter implements InputFilter { @Override @Nonnull public List<File> getImportedLibrary() { - return options.getJayceImport(); + return options.getImportedLibraries(); } } diff --git a/jack/tests/com/android/jack/TestTools.java b/jack/tests/com/android/jack/TestTools.java index 75ec8e60..57b4b803 100644 --- a/jack/tests/com/android/jack/TestTools.java +++ b/jack/tests/com/android/jack/TestTools.java @@ -244,8 +244,8 @@ public class TestTools { public static void compileJackToDex( Options options, File in, File out, boolean zip) throws Exception { - options.jayceImport = new ArrayList<File>(1); - options.jayceImport.add(in); + options.importedLibraries = new ArrayList<File>(1); + options.importedLibraries.add(in); if (zip) { options.outZip = out; } else { @@ -260,8 +260,8 @@ public class TestTools { File out, List<ProguardFlags> flagFiles, boolean zip) throws Exception { - options.jayceImport = new ArrayList<File>(1); - options.jayceImport.add(in); + options.importedLibraries = new ArrayList<File>(1); + options.importedLibraries.add(in); options.classpath = classpath; if (zip) { options.libraryOutZip = out; @@ -323,8 +323,8 @@ public class TestTools { File out, File jarjarRules, boolean zip) throws Exception { - options.jayceImport = new ArrayList<File>(1); - options.jayceImport.add(in); + options.importedLibraries = new ArrayList<File>(1); + options.importedLibraries.add(in); options.classpath = classpath; if (zip) { options.libraryOutZip = out; diff --git a/jack/tests/com/android/jack/library/LibraryTest.java b/jack/tests/com/android/jack/library/LibraryTest.java index 21b58363..db8f0217 100644 --- a/jack/tests/com/android/jack/library/LibraryTest.java +++ b/jack/tests/com/android/jack/library/LibraryTest.java @@ -65,7 +65,7 @@ public class LibraryTest { public void testImportEmptyLibrary() throws Exception { File lib = createEmptyLibrary(); Options options = new Options(); - options.addJayceImport(lib); + options.addImportedLibrary(lib); TestTools.compileSourceToDex(options, TestTools.getJackTestsWithJackFolder("library/test001"), TestTools.getDefaultClasspathString(), @@ -76,7 +76,7 @@ public class LibraryTest { public void testImportRscLibrary() throws Exception { File lib = createRscLibrary(); Options options = new Options(); - options.addJayceImport(lib); + options.addImportedLibrary(lib); File out = TestTools.createTempFile("library001", ".jack"); TestTools.compileSourceToJack(options, TestTools.getJackTestsWithJackFolder("library/test001"), |