Commit 5c930e67 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Android: Fix multidex proguard config messing up obfuscation

This rule was causing @MainDex methods to be obfuscated, even when they
were marked as -keep by a previous rule.

Turns out that this rule is entirely unnecessary for maintaining
@MainDex annotations anyways.

Bug: 887954
Change-Id: I3f371d4c24f91e217494f02b45e9401a8628688a
Reviewed-on: https://chromium-review.googlesource.com/1238784Reviewed-by: default avatarSam Maier <smaier@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593300}
parent fa12b9d3
...@@ -6,9 +6,3 @@ ...@@ -6,9 +6,3 @@
# can be used to create the main dex list. # can be used to create the main dex list.
-keepattributes *Annotations* -keepattributes *Annotations*
-keep @interface org.chromium.base.annotations.MainDex -keep @interface org.chromium.base.annotations.MainDex
# Keep the members only if the class is kept. Also required for the annotation
# itself to be kept, which is necessary for main dex list processing.
-keepclassmembers,allowobfuscation class * {
@**.MainDex *;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment