diff options
author | Colin Cross <ccross@android.com> | 2017-12-18 12:08:42 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2017-12-18 12:19:41 -0800 |
commit | 9e1602fcb030f33d2d263acd783a9e24fccb3e7d (patch) | |
tree | 954d8ab4c9b7aff3c52f5aef335db46528800cbb | |
parent | 0156e0d255709355b1e8f5303bd8256ab6967b0a (diff) | |
parent | 9797e822f8bf3ebfea27240271b715cf3a6837b7 (diff) | |
download | desugar-9e1602fcb030f33d2d263acd783a9e24fccb3e7d.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into masterandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7o-mr1-iot-preview-8o-mr1-iot-preview-7
* aosp/upstream-master:
Automatic formatting cleanup of Android *.java files.
Eagerly close directory content stream again when looking for dumped lambdas RELNOTES: None.
reflect prefix in additional ClassReader methods for consistency with what happens during visit() RELNOTES: None.
Bug: 70415451
Test: m checkbuild
Change-Id: Ia4743853a34a9c0d315663959eac0dcd0fdb627b
3 files changed, 31 insertions, 11 deletions
diff --git a/java/com/google/devtools/build/android/desugar/BitFlags.java b/java/com/google/devtools/build/android/desugar/BitFlags.java index bb32c45..8be2288 100644 --- a/java/com/google/devtools/build/android/desugar/BitFlags.java +++ b/java/com/google/devtools/build/android/desugar/BitFlags.java @@ -15,14 +15,12 @@ package com.google.devtools.build.android.desugar; import org.objectweb.asm.Opcodes; -/** - * Convenience method for working with {@code int} bitwise flags. - */ +/** Convenience method for working with {@code int} bitwise flags. */ class BitFlags { /** - * Returns {@code true} iff <b>all</b> bits in {@code bitmask} are set in {@code flags}. - * Trivially returns {@code true} if {@code bitmask} is 0. + * Returns {@code true} iff <b>all</b> bits in {@code bitmask} are set in {@code flags}. Trivially + * returns {@code true} if {@code bitmask} is 0. */ public static boolean isSet(int flags, int bitmask) { return (flags & bitmask) == bitmask; diff --git a/java/com/google/devtools/build/android/desugar/CoreLibraryRewriter.java b/java/com/google/devtools/build/android/desugar/CoreLibraryRewriter.java index cbb3271..7f1591b 100644 --- a/java/com/google/devtools/build/android/desugar/CoreLibraryRewriter.java +++ b/java/com/google/devtools/build/android/desugar/CoreLibraryRewriter.java @@ -116,6 +116,26 @@ class CoreLibraryRewriter { super.accept(cv, attrs, flags); } + @Override + public String getClassName() { + return prefix(super.getClassName()); + } + + @Override + public String getSuperName() { + String result = super.getSuperName(); + return result != null ? prefix(result) : null; + } + + @Override + public String[] getInterfaces() { + String[] result = super.getInterfaces(); + for (int i = 0, len = result.length; i < len; ++i) { + result[i] = prefix(result[i]); + } + return result; + } + /** Prefixes core library class names with prefix. */ private String prefix(String typeName) { if (shouldPrefix(typeName)) { diff --git a/java/com/google/devtools/build/android/desugar/LambdaClassMaker.java b/java/com/google/devtools/build/android/desugar/LambdaClassMaker.java index 1f240ef..72f039a 100644 --- a/java/com/google/devtools/build/android/desugar/LambdaClassMaker.java +++ b/java/com/google/devtools/build/android/desugar/LambdaClassMaker.java @@ -27,6 +27,7 @@ import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; +import java.util.stream.Stream; class LambdaClassMaker { @@ -80,11 +81,12 @@ class LambdaClassMaker { if (!Files.exists(rootPathPrefix.getParent())) { return ImmutableList.of(); } - return Files.list(rootPathPrefix.getParent()) - .filter( - path -> - path.toString().startsWith(rootPathPrefixStr) - && !existingPaths.contains(path)) - .collect(ImmutableList.toImmutableList()); + try (Stream<Path> paths = + Files.list(rootPathPrefix.getParent()) + .filter( + path -> path.toString().startsWith(rootPathPrefixStr) + && !existingPaths.contains(path))) { + return paths.collect(ImmutableList.toImmutableList()); + } } } |