| Index: testing/android/proguard_under_test.flags
|
| diff --git a/testing/android/proguard_for_test.flags b/testing/android/proguard_under_test.flags
|
| similarity index 86%
|
| rename from testing/android/proguard_for_test.flags
|
| rename to testing/android/proguard_under_test.flags
|
| index f427ac695781a6861f562fd6aefc3ab8612a96df..12714656bf0e43b0bfaffd14131736fdf313e1e0 100644
|
| --- a/testing/android/proguard_for_test.flags
|
| +++ b/testing/android/proguard_under_test.flags
|
| @@ -103,3 +103,11 @@
|
| int mr_chooser_list;
|
| int find_toolbar;
|
| }
|
| +
|
| +# This is to prevent renaming two methods in two different interfaces to the
|
| +# same name. The testing .apk has a few classes which implement two interfaces
|
| +# that are never implemented together in the real .apk, and thus would create a
|
| +# conflict. We don't expect the absence of this to cause any issues in the real
|
| +# .apk, since the same classes are still being obfuscated, and the ProGuarded
|
| +# .apk is not then being fed into another run.
|
| +-useuniqueclassmembernames
|
|
|