Make KeepScanner tool search classpath for nearest definition of each member reference, instead of potentially referring to a subtype.

Refactor desugar's class loading machinery and related code into a separate package for easier reuse in this tool.
RELNOTES: None.

PiperOrigin-RevId: 188825305

2 files changed, 20 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/android/desugar/scan/testdata/CollectionReferences.java b/src/test/java/com/google/devtools/build/android/desugar/scan/testdata/CollectionReferences.java
index 482c32a9ba..830364c06c 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/scan/testdata/CollectionReferences.java
+++ b/src/test/java/com/google/devtools/build/android/desugar/scan/testdata/CollectionReferences.java
@@ -54,6 +54,10 @@ public class CollectionReferences {
     return result;
   }
 
+  public void expire(long before) {
+    dates.removeIf(d -> d.getTime() < before);
+  }
+
   static {
     System.out.println("Hello!");
   }
diff --git a/src/test/java/com/google/devtools/build/android/desugar/scan/testdata_golden.txt b/src/test/java/com/google/devtools/build/android/desugar/scan/testdata_golden.txt
index 35744cefd9..60825763f5 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/scan/testdata_golden.txt
+++ b/src/test/java/com/google/devtools/build/android/desugar/scan/testdata_golden.txt
@@ -18,6 +18,19 @@
 -keep class java.lang.System {
   *** out;
 }
+-keep class java.lang.invoke.CallSite {
+}
+-keep class java.lang.invoke.LambdaMetafactory {
+  *** metafactory(java.lang.invoke.MethodHandles$Lookup, java.lang.String, java.lang.invoke.MethodType, java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, java.lang.invoke.MethodType);
+}
+-keep class java.lang.invoke.MethodHandle {
+}
+-keep class java.lang.invoke.MethodHandles {
+}
+-keep class java.lang.invoke.MethodHandles$Lookup {
+}
+-keep class java.lang.invoke.MethodType {
+}
 -keep class java.util.AbstractList {
 }
 -keep class java.util.ArrayList {
@@ -28,6 +41,7 @@
   *** iterator();
 }
 -keep class java.util.Collection {
+  *** removeIf(java.util.function.Predicate);
 }
 -keep class java.util.Date {
   <init>(long);
@@ -44,3 +58,5 @@
   *** get(int);
   *** iterator();
 }
+-keep class java.util.function.Predicate {
+}