diff options
author | Eric Erfanian <erfanian@google.com> | 2017-03-24 09:31:16 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-03-27 08:56:19 -0700 |
commit | 9050823ccf6f512e06ad65c8a741cb17cbc4a833 (patch) | |
tree | e454c9e0fa20b8384fa87d4e6309bb8b9e3aa2a4 /proguard.flags | |
parent | dd9d50805f1b49dff1fe3787740393d726124cdb (diff) | |
download | android_packages_apps_Dialer-9050823ccf6f512e06ad65c8a741cb17cbc4a833.tar.gz android_packages_apps_Dialer-9050823ccf6f512e06ad65c8a741cb17cbc4a833.tar.bz2 android_packages_apps_Dialer-9050823ccf6f512e06ad65c8a741cb17cbc4a833.zip |
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
Diffstat (limited to 'proguard.flags')
-rw-r--r-- | proguard.flags | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/proguard.flags b/proguard.flags deleted file mode 100644 index a5e34b712..000000000 --- a/proguard.flags +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright (C) 2016 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License -# - --keepattributes SourceFile,LineNumberTable --dontpreverify --dontskipnonpubliclibraryclasses --dontusemixedcaseclassnames --keepclasseswithmembernames class * { - native <methods>; -} - --keepclassmembers enum * { - public static **[] values(); -} - --keepclassmembers class * implements android.os.Parcelable { - public static *** CREATOR; -} - --keepclassmembers class * implements java.io.Serializable { - static final long serialVersionUID; - private static final java.io.ObjectStreamField[] serialPersistentFields; - private void writeObject(java.io.ObjectOutputStream); - private void readObject(java.io.ObjectInputStream); - java.lang.Object writeReplace(); - java.lang.Object readResolve(); -} - --dontwarn com.google.common.** --dontwarn com.google.errorprone.annotations.** --dontwarn android.app.Notification --dontnote android.graphics.Insets --dontnote libcore.icu.ICU --keep class libcore.icu.ICU { *** get(...);} --dontnote android.support.v4.app.NotificationCompatJellybean - --allowaccessmodification --renamesourcefileattribute PG - --assumenosideeffects class android.util.Log { - static *** i(...); - static *** d(...); - static *** v(...); - static *** isLoggable(...); -} - --dontwarn org.apache.http.** - -# Used in com.android.dialer.answer.impl.SmsBottomSheetFragment --keep class android.support.design.widget.BottomSheetBehavior { - public <init>(android.content.Context, android.util.AttributeSet); - public <init>(); -} - -# Keep the annotation, classes, methods, and fields marked as UsedByReflection --keep class com.android.dialer.proguard.UsedByReflection --keep @com.android.dialer.proguard.UsedByReflection class * --keepclassmembers class * { - @com.android.dialer.proguard.UsedByReflection *; -} |