aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools
diff options
context:
space:
mode:
authorGravatar kmb <kmb@google.com>2018-07-13 10:33:55 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-07-13 10:35:20 -0700
commit32e9fee4e2192a340d0b1823538bf8e9fdf92b65 (patch)
treefb75535dbcf3a054653c837b9c914357dbe4d8dd /src/tools
parentf7217ffb83a85ea592119b34853ff0852fba9d28 (diff)
Drop module-info "class" in Android desugaring
RELNOTES: None. PiperOrigin-RevId: 204492527
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java b/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java
index c176f9cfc2..e40d8728d6 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java
@@ -524,6 +524,9 @@ class Desugar {
ImmutableSet.Builder<String> interfaceLambdaMethodCollector)
throws IOException {
for (String inputFilename : inputFiles) {
+ if ("module-info.class".equals(inputFilename)) {
+ continue; // Drop module-info.class since it has no meaning on Android
+ }
if (OutputFileProvider.DESUGAR_DEPS_FILENAME.equals(inputFilename)) {
// TODO(kmb): rule out that this happens or merge input file with what's in depsCollector
continue; // skip as we're writing a new file like this at the end or don't want it