Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0eecb91 authored by John Shao's avatar John Shao
Browse files

Fix gradle release build (1/2) 

Jack toolchain in build tools 26.0.0 has some issues in obfuscation that
cases runtime errors in guava collect and concurrent. Add proguard flags
to workaround this. Note that we are still getting a dramatic
improvement in apk size since release build in jack is 7.1 mbs but old
make builds was 11 mbs.

Test:
  Run installGoogleRelease and sanity checks
  Built GoogleContacts user in make
  Ran make GoogleContactsTests
  Ran gradle connectedGoogleDebugAndroidTest

Bug:34127945
Bug:34917059
Change-Id: Ifebe6907cae87ac574bae1f7aefd83a79258badb
parent 8bca1220

proguard.flags

+5 −7
Original line number Diff line number Diff line 
-ignorewarnings

-useuniqueclassmembernames



-keep class com.android.contacts.model.Sources {

  public <init>(...);
@@ -101,12 +101,10 @@ 
-keep class com.google.common.base.Functions { *; }

-keep class com.google.common.base.Objects { *; }

-keep class com.google.common.base.Preconditions { *; }

-keep class com.google.common.collect.ImmutableMap { *; }

-keep class com.google.common.collect.ImmutableSet { *; }

-keep class com.google.common.collect.Lists { *; }

-keep class com.google.common.collect.Maps { *; }

-keep class com.google.common.collect.Multimap { *; }

-keep class com.google.common.collect.Sets { *; }

-keep class com.google.common.collect.** { *; }

-keep class com.google.common.util.concurrent.** { *; }



-keep class com.android.common.widget.CompositeCursorAdapter { *; }



# Any class or method annotated with NeededForReflection.

-keep @com.android.contacts.test.NeededForReflection class *