diff options
| author |  Googler <noreply@google.com> | 2016-08-22 17:07:29 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2016-08-23 09:28:53 +0000 |
| commit | cb80dd51cf2a50d1d55c5eaf0a43a89f6dd744c9 (patch) | |
| tree | 5e6303f07d2d8c215dfa580a5a35a5b76ceb3911 /third_party/java/apkbuilder | |
| parent | 6230823214257603dc77d2b074432565d2bf53cd (diff) | |
removed protobuf.meta and flags.xml from apk
--
MOS_MIGRATED_REVID=130950815
Diffstat (limited to 'third_party/java/apkbuilder')
| -rw-r--r-- | third_party/java/apkbuilder/java/com/android/sdklib/build/ApkBuilder.java | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/third_party/java/apkbuilder/java/com/android/sdklib/build/ApkBuilder.java b/third_party/java/apkbuilder/java/com/android/sdklib/build/ApkBuilder.java index 4a69e2efd1..fb4b07bc47 100644 --- a/third_party/java/apkbuilder/java/com/android/sdklib/build/ApkBuilder.java +++ b/third_party/java/apkbuilder/java/com/android/sdklib/build/ApkBuilder.java @@ -85,6 +85,7 @@ public final class ApkBuilder implements IArchiveBuilder { * resources, and also record whether the zip file contains native libraries. * <p/>Used in {@link SignedJarBuilder#writeZip(java.io.InputStream, IZipEntryFilter)} when * we only want the java resources from external jars. + * */ private final class JavaAndNativeResourceFilter implements IZipEntryFilter { private final List<String> mNativeLibs = new ArrayList<String>(); @@ -987,19 +988,21 @@ public final class ApkBuilder implements IArchiveBuilder { return false; } - return !"aidl".equalsIgnoreCase(extension) && // Aidl files - !"rs".equalsIgnoreCase(extension) && // RenderScript files - !"fs".equalsIgnoreCase(extension) && // FilterScript files - !"rsh".equalsIgnoreCase(extension) && // RenderScript header files - !"d".equalsIgnoreCase(extension) && // Dependency files - !"java".equalsIgnoreCase(extension) && // Java files - !"scala".equalsIgnoreCase(extension) && // Scala files - !"class".equalsIgnoreCase(extension) && // Java class files - !"scc".equalsIgnoreCase(extension) && // VisualSourceSafe - !"swp".equalsIgnoreCase(extension) && // vi swap file - !"thumbs.db".equalsIgnoreCase(fileName) && // image index file - !"picasa.ini".equalsIgnoreCase(fileName) && // image index file - !"package.html".equalsIgnoreCase(fileName) && // Javadoc - !"overview.html".equalsIgnoreCase(fileName); // Javadoc + return !"aidl".equalsIgnoreCase(extension) && // Aidl files + !"rs".equalsIgnoreCase(extension) && // RenderScript files + !"fs".equalsIgnoreCase(extension) && // FilterScript files + !"rsh".equalsIgnoreCase(extension) && // RenderScript header files + !"d".equalsIgnoreCase(extension) && // Dependency files + !"java".equalsIgnoreCase(extension) && // Java files + !"scala".equalsIgnoreCase(extension) && // Scala files + !"class".equalsIgnoreCase(extension) && // Java class files + !"scc".equalsIgnoreCase(extension) && // VisualSourceSafe + !"swp".equalsIgnoreCase(extension) && // vi swap file + !"thumbs.db".equalsIgnoreCase(fileName) && // image index file + !"picasa.ini".equalsIgnoreCase(fileName) && // image index file + !"package.html".equalsIgnoreCase(fileName) && // Javadoc + !"overview.html".equalsIgnoreCase(fileName) && // Javadoc + !"protobuf.meta".equalsIgnoreCase(fileName) && // protobuf.meta + !"flags.xml".equalsIgnoreCase(fileName); // flags.xml } } |