diff options
| author | Mikael Peltier <mikaelpeltier@google.com> | 2015-02-26 12:57:24 +0000 |
|---|---|---|
| committer | mikaelpeltier <mikaelpeltier@google.com> | 2015-02-26 14:51:51 +0100 |
| commit | 688050c45d5f9bd95edaffdccc43f930430217e4 (patch) | |
| tree | 406e9db4bc42c8868389ccc4610279fe002bc305 /jack | |
| parent | 58ffd272b6b99f445de4e9553444fe1a88e3fd51 (diff) | |
| download | toolchain_jack-688050c45d5f9bd95edaffdccc43f930430217e4.tar.gz toolchain_jack-688050c45d5f9bd95edaffdccc43f930430217e4.tar.bz2 toolchain_jack-688050c45d5f9bd95edaffdccc43f930430217e4.zip | |
Revert "Remove a usage of list method into JaycePackageLoader"
This reverts commit 8c145231a3889a6ba62c76b5102c0075575a2114.
Usage of vfs increase compilation time (Bug: 19518782)
Change-Id: I70aa642d10ae0c9c108e322d59f781dfc14fd6c9
Diffstat (limited to 'jack')
| -rw-r--r-- | jack/src/com/android/jack/jayce/JaycePackageLoader.java | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/jack/src/com/android/jack/jayce/JaycePackageLoader.java b/jack/src/com/android/jack/jayce/JaycePackageLoader.java index 46abf30b..6941963a 100644 --- a/jack/src/com/android/jack/jayce/JaycePackageLoader.java +++ b/jack/src/com/android/jack/jayce/JaycePackageLoader.java @@ -32,14 +32,11 @@ import com.android.jack.library.LibraryReadingException; import com.android.jack.load.PackageLoader; import com.android.jack.lookup.JPhantomLookup; import com.android.jack.reporting.Reporter.Severity; -import com.android.sched.util.file.NoSuchFileException; -import com.android.sched.util.file.NotDirectoryException; import com.android.sched.util.location.Location; import com.android.sched.util.log.LoggerFactory; import com.android.sched.vfs.InputVDir; import com.android.sched.vfs.InputVElement; import com.android.sched.vfs.InputVFile; -import com.android.sched.vfs.VPath; import java.util.ArrayList; import java.util.Collection; @@ -117,16 +114,14 @@ public class JaycePackageLoader implements PackageLoader, HasInputLibrary { @Nonnull @Override - public PackageLoader getLoaderForSubPackage(@Nonnull JPackage loading, @Nonnull String simpleName) - throws JPackageLookupException { - try { - return new JaycePackageLoader(inputJackLibrary, - packageVDir.getInputVDir(new VPath(simpleName, '/')), lookup, defaultLoadLevel); - } catch (NotDirectoryException e) { - throw new JPackageLookupException(simpleName, loading); - } catch (NoSuchFileException e) { - throw new JPackageLookupException(simpleName, loading); + public PackageLoader getLoaderForSubPackage(@Nonnull JPackage loading, + @Nonnull String simpleName) throws JPackageLookupException { + for (InputVElement sub : packageVDir.list()) { + if (sub.isVDir() && sub.getName().equals(simpleName)) { + return new JaycePackageLoader(inputJackLibrary, (InputVDir) sub, lookup, defaultLoadLevel); + } } + throw new JPackageLookupException(simpleName, loading); } @Nonnull |