| commit | 2e16590553ad937201b856679ed17b1420069da5 | [log] [tgz] |
|---|---|---|
| author | Søren Gjesse <sgjesse@google.com> | Tue May 29 06:23:19 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue May 29 06:23:19 2018 +0000 |
| tree | a99f99dd2195344ca4ec1f8a6d56ed2178e05aa2 | |
| parent | 2d58dfa72f6a6e4052371cb4a88279e6187b5184 [diff] | |
| parent | f12b778fb093e8e0adbd487dc6f2ac7b6fc4a2cd [diff] |
Merge "Fix for some tests with invalid Dalvik dex code"
diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardConfiguration.java b/src/main/java/com/android/tools/r8/shaking/ProguardConfiguration.java index dd82dfd..d4d4bcb 100644 --- a/src/main/java/com/android/tools/r8/shaking/ProguardConfiguration.java +++ b/src/main/java/com/android/tools/r8/shaking/ProguardConfiguration.java
@@ -305,8 +305,8 @@ // disableOptimization(); } - if ((keepAttributePatterns.isEmpty() - && (rulesWasEmpty || (forceProguardCompatibility && !isObfuscating()))) + if ((keepAttributePatterns.isEmpty() && rulesWasEmpty) + || (forceProguardCompatibility && !isObfuscating()) || !isShrinking()) { keepAttributePatterns.addAll(ProguardKeepAttributes.KEEP_ALL); }
diff --git a/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java b/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java index 91fc9d4..642045c 100644 --- a/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java +++ b/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java
@@ -110,7 +110,7 @@ // The test contains only a member class so the enclosing-method attribute will be null. assertEquals( - !keepAnnotations && forceProguardCompatibility, + forceProguardCompatibility, !clazz.getDexClass().getInnerClasses().isEmpty()); assertEquals(forceProguardCompatibility || keepAnnotations, clazz.annotation(annotationClass.getCanonicalName()).isPresent());