From 9050823ccf6f512e06ad65c8a741cb17cbc4a833 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Fri, 24 Mar 2017 09:31:16 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/151128062 Test: make, treehugger This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from cl/150756069 (3/21/2017) to cl/151128062 (3/24/2017). Notable this release: - Explicitly enumerate host and target dependencies. - Update proguard flag references. This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Bug: 33210202 36511925 Addresses 33210202 - Proguard support 36511925 - Compiler warnings when building against platform sdk Change-Id: I448ec3b3f2358886859cf7a4ef76a8fcef3244ae --- java/com/android/dialer/proguard/proguard.flags | 1 + java/com/android/dialer/proguard/proguard_release.flags | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'java/com/android/dialer/proguard') diff --git a/java/com/android/dialer/proguard/proguard.flags b/java/com/android/dialer/proguard/proguard.flags index 0f684a0b3..514531353 100644 --- a/java/com/android/dialer/proguard/proguard.flags +++ b/java/com/android/dialer/proguard/proguard.flags @@ -4,3 +4,4 @@ -keepclassmembers class * { @com.android.dialer.proguard.UsedByReflection *; } +-keep class android.support.design.widget.FloatingActionButton$* { *; } \ No newline at end of file diff --git a/java/com/android/dialer/proguard/proguard_release.flags b/java/com/android/dialer/proguard/proguard_release.flags index 1c845cfa3..c6bdd490e 100644 --- a/java/com/android/dialer/proguard/proguard_release.flags +++ b/java/com/android/dialer/proguard/proguard_release.flags @@ -4,7 +4,7 @@ # By default, proguard leaves all classes in their original package, which # needlessly repeats com.google.android.apps.etc. --repackageclasses "" +-repackageclasses '' # Allows proguard to make private and protected methods and fields public as # part of optimization. This lets proguard inline trivial getter/setter methods. -- cgit v1.2.3