| commit | 11e6d3b792f1ff7d0ada3f0d2e01d3485cfe030e | [log] [tgz] |
|---|---|---|
| author | Jinseong Jeon <jsjeon@google.com> | Tue Mar 13 10:32:03 2018 -0700 |
| committer | Jinseong Jeon <jsjeon@google.com> | Tue Mar 13 10:32:03 2018 -0700 |
| tree | 6071b8070e460313fbd2485bd71aa7143d999e2f | |
| parent | f9c368a034f170a7038e3f1c67dc592efb291f56 [diff] |
Avoid adding keep rule for library classes in compat mode. Bug: 74233021 Change-Id: I072f7237ae251f0d1e05ae616d48d24f14fbfd13
diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java index c2e73cd..9e00a64 100644 --- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java +++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -423,7 +423,7 @@ DexType baseType = type.toBaseType(appInfo.dexItemFactory); if (baseType.isClassType()) { DexClass baseClass = appInfo.definitionFor(baseType); - if (baseClass != null) { + if (baseClass != null && !baseClass.isLibraryClass()) { markClassAsInstantiatedWithCompatRule(baseClass); } else { // This handles reporting of missing classes.