diff options
| author |  kmb <kmb@google.com> | 2017-09-21 19:38:10 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-09-22 12:15:36 +0200 |
| commit | 60f35034f5a2bbaee629695782beb4a3c0216f0f (patch) | |
| tree | 300eac00948ed84519913a96fe76703f8fb5f977 /src/tools/android/java/com/google/devtools/build/android/ziputils | |
| parent | 399ffaf0dd20abed25f83bd8fcf47fce9ccd94d4 (diff) | |
PiperOrigin-RevId: 169563607
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/ziputils')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java b/src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java index 931879159a..03ac790058 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java +++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/DexMapper.java @@ -45,9 +45,12 @@ public class DexMapper { String resourceFile = options.outputResources; try { - Predicate<String> inputFilter = Predicates.alwaysTrue(); + // Always drop desugaring metadata, which we check elsewhere and don't want in final APKs + // (see b/65645388). + Predicate<String> inputFilter = Predicates.not(Predicates.equalTo("META_INF/desugar_deps")); if (options.inclusionFilterJar != null) { - inputFilter = SplitZipFilters.entriesIn(options.inclusionFilterJar); + inputFilter = + Predicates.and(inputFilter, SplitZipFilters.entriesIn(options.inclusionFilterJar)); } new SplitZip() .setVerbose(false) |