commit | 38f9d71955d87ddea83a96fd960443225a4a7038 | [log] [tgz] |
---|---|---|
author | Rico Wind <ricow@google.com> | Fri Jun 02 14:07:02 2023 +0200 |
committer | Rico Wind <ricow@google.com> | Fri Jun 02 12:28:03 2023 +0000 |
tree | 92c7ffe15ce94e2f3545e1fd134539ce85829ecc | |
parent | 5f9a8d5fe71552065abf7799e3a84d291d089257 [diff] |
Only fail on api lookup for library classes We saw a case in google3 where android.jar was passed as classpath: http://google3/java/com/google/play/apps/integrity/silo/dexpayload/bzl/d8ing.bzl;l=23;rcl=536882057 Bug: 285560198 Change-Id: Ic0403ac5c594bb1d642accd17fb226108f63d85c
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java b/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java index 4643e0a..f715e77 100644 --- a/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java +++ b/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
@@ -322,7 +322,7 @@ .contextIndependentDefinitionForWithResolutionResult(type) .toSingleClassWithProgramOverLibrary(); assert theApi.equals(api.max(appView.options().getMinApiLevel())) - || (clazz != null && clazz.isProgramClass()); + || (clazz != null && !clazz.isLibraryClass()); }); return true; }