diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-20 07:31:36 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-20 07:31:36 +0000 |
commit | 4c37f73c5965a086bd93b0494a765de473f915b3 (patch) | |
tree | 40c1716d3ba74eac2f10f56a9cae26d69ee1c979 | |
parent | a959a4177771cc1728773944cc2adda9d71eed22 (diff) | |
parent | 84daa01ee27b9a0503722450e29225c0f63f33ab (diff) | |
download | vogar-oreo-m5-release.tar.gz |
release-request-d8901a87-7dd0-4cc8-a44e-d04982e429da-for-git_oc-mr1-release-4198291 snap-temp-L50900000084068812android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release
Change-Id: I6f6766eb1ded306d4f6a7c1a00ea192eacb8579b
-rw-r--r-- | src/vogar/target/ClassPathScanner.java | 72 |
1 files changed, 44 insertions, 28 deletions
diff --git a/src/vogar/target/ClassPathScanner.java b/src/vogar/target/ClassPathScanner.java index af079e5..8bad54e 100644 --- a/src/vogar/target/ClassPathScanner.java +++ b/src/vogar/target/ClassPathScanner.java @@ -21,7 +21,9 @@ import java.io.File; import java.io.IOException; import java.util.Comparator; import java.util.Enumeration; +import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Set; import java.util.TreeSet; import java.util.regex.Pattern; @@ -47,10 +49,27 @@ final class ClassPathScanner { private final String[] classPath; private final ClassFinder classFinder; + private static Map<String, DexFile> createDexFiles(String[] classPath) { + Map<String, DexFile> result = new HashMap<String, DexFile>(); + for (String entry : classPath) { + File classPathEntry = new File(entry); + if (!classPathEntry.exists() || classPathEntry.isDirectory()) { + continue; + } + + try { + result.put(classPathEntry.getName(), new DexFile(classPathEntry)); + } catch (IOException ignore) { + // okay, presumably the dex file didn't contain any classes + } + } + return result; + } + ClassPathScanner() { classPath = getClassPath(); if ("Dalvik".equals(System.getProperty("java.vm.name"))) { - classFinder = new ApkClassFinder(); + classFinder = new ApkClassFinder(createDexFiles(classPath)); } else { // When running vogar tests under an IDE the classes are not held in a .jar file. // This system properties can be set to make it possible to run the vogar tests from an @@ -209,41 +228,38 @@ final class ClassPathScanner { * to load on non-Android VMs. */ private static class ApkClassFinder implements ClassFinder { + private final Map<String, DexFile> dexFiles; + + ApkClassFinder(Map<String, DexFile> dexFiles) { + this.dexFiles = dexFiles; + } + public void find(File classPathEntry, String pathPrefix, String packageName, Set<String> classNames, Set<String> subpackageNames) { if (classPathEntry.isDirectory()) { return; } - DexFile dexFile = null; - try { - dexFile = new DexFile(classPathEntry); - Enumeration<String> apkClassNames = dexFile.entries(); - while (apkClassNames.hasMoreElements()) { - String className = apkClassNames.nextElement(); - if (!className.startsWith(packageName)) { - continue; - } + DexFile dexFile = dexFiles.get(classPathEntry.getName()); + if (dexFile == null) { + return; + } + Enumeration<String> apkClassNames = dexFile.entries(); + while (apkClassNames.hasMoreElements()) { + String className = apkClassNames.nextElement(); + if (!className.startsWith(packageName)) { + continue; + } - String subPackageName = packageName; - int lastPackageSeparator = className.lastIndexOf('.'); - if (lastPackageSeparator > 0) { - subPackageName = className.substring(0, lastPackageSeparator); - } - if (subPackageName.length() > packageName.length()) { - subpackageNames.add(subPackageName); - } else if (isToplevelClass(className)) { - classNames.add(className); - } + String subPackageName = packageName; + int lastPackageSeparator = className.lastIndexOf('.'); + if (lastPackageSeparator > 0) { + subPackageName = className.substring(0, lastPackageSeparator); } - } catch (IOException ignore) { - // okay, presumably the dex file didn't contain any classes - } finally { - if (dexFile != null) { - try { - dexFile.close(); - } catch (IOException ignore) { - } + if (subPackageName.length() > packageName.length()) { + subpackageNames.add(subPackageName); + } else if (isToplevelClass(className)) { + classNames.add(className); } } } |