diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2014-11-14 14:52:21 +0100 |
|---|---|---|
| committer | Benoit Lamarche <benoitlamarche@google.com> | 2014-11-14 17:49:30 +0000 |
| commit | fac8c95c11bbc08d4397f4ab53d70c5106f1452a (patch) | |
| tree | b3378045b0778c3ded1a6ac5713c457fdd530b89 /jack/src | |
| parent | 9f2537986bb60e346c5e2b8a0a4e695859bd19d4 (diff) | |
| download | toolchain_jack-fac8c95c11bbc08d4397f4ab53d70c5106f1452a.zip toolchain_jack-fac8c95c11bbc08d4397f4ab53d70c5106f1452a.tar.gz toolchain_jack-fac8c95c11bbc08d4397f4ab53d70c5106f1452a.tar.bz2 | |
Use resImport option
Change-Id: I0188dd3cfba96269beee4d996495f48eaa095170
Diffstat (limited to 'jack/src')
| -rw-r--r-- | jack/src/com/android/jack/Jack.java | 2 | ||||
| -rw-r--r-- | jack/src/com/android/jack/Options.java | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/jack/src/com/android/jack/Jack.java b/jack/src/com/android/jack/Jack.java index 74bb4f4..c3abed2 100644 --- a/jack/src/com/android/jack/Jack.java +++ b/jack/src/com/android/jack/Jack.java @@ -709,7 +709,7 @@ public abstract class Jack { try { - getResourceImporter(options.getImportedResources(), hooks).doImport(session); + getResourceImporter(options.resImport, hooks).doImport(session); } catch (ResourceReadingException e) { session.getReporter().report(Severity.FATAL, e); throw new JackAbortException(e); diff --git a/jack/src/com/android/jack/Options.java b/jack/src/com/android/jack/Options.java index bccb880..ebb51ce 100644 --- a/jack/src/com/android/jack/Options.java +++ b/jack/src/com/android/jack/Options.java @@ -398,11 +398,6 @@ public class Options { } @Nonnull - public List<File> getImportedResources() { - return Collections.emptyList(); - } - - @Nonnull private List<File> getFilesFromPathString(@CheckForNull String pathString) { List<File> classpath = new ArrayList<File>(); if (pathString != null && !pathString.isEmpty()) { |