summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-05-17 21:01:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-05-17 21:01:18 +0000
commit3148d486e45f1a27caa8a091e51e9ae7095baeb9 (patch)
tree3f9f59beea6747bbb3def88d0eb2e93fbebef603
parent1df3cac94c608983f40fdb3471b32ee704706e37 (diff)
parent508c8f3ac8e5bc4d1f753f1dc3b7a8cb8e351292 (diff)
downloadandroid_packages_apps_Trebuchet-3148d486e45f1a27caa8a091e51e9ae7095baeb9.tar.gz
android_packages_apps_Trebuchet-3148d486e45f1a27caa8a091e51e9ae7095baeb9.tar.bz2
android_packages_apps_Trebuchet-3148d486e45f1a27caa8a091e51e9ae7095baeb9.zip
Merge changes from topic 'am-ab6fc536-0646-4c6c-ae5a-3c2749ab079f' into ub-launcher3-master
* changes: When building Launcher3 target, LauncherDumpProto class should not be proguarded b/36904684 am: 2d4d1c532d When building Launcher3 target, LauncherDumpProto class should not be proguarded b/36904684
-rw-r--r--proguard.flags4
1 files changed, 4 insertions, 0 deletions
diff --git a/proguard.flags b/proguard.flags
index 2ad9cacf2..51abccae9 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -98,3 +98,7 @@
-keep interface com.android.launcher3.userevent.nano.LauncherLogProto.** {
*;
}
+
+-keep interface com.android.launcher3.model.nano.LauncherDumpProto.** {
+ *;
+}