summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaman Tenneti <rtenneti@google.com>2019-02-27 15:01:36 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-27 15:01:36 -0800
commit7900c4cb02e3ed0b172e42c0c135372c31296a0c (patch)
tree8b320b78519766ab74c6be7d3cc6b0d37cde7a3e
parented868b5ad0fd2b978797e4b33e12853bb655f8fe (diff)
parent10d7e7db2ab8c49685f146cd8f9b905a28884fdc (diff)
downloadpackages_apps_Messaging-7900c4cb02e3ed0b172e42c0c135372c31296a0c.tar.gz
packages_apps_Messaging-7900c4cb02e3ed0b172e42c0c135372c31296a0c.tar.bz2
packages_apps_Messaging-7900c4cb02e3ed0b172e42c0c135372c31296a0c.zip
AOSP/Messaging - Added LOCAL_COMPATIBILITY_SUITE := device-tests to fix "Missing test_suite setting for test". am: bada9f9b46 am: 62f573f1ef
am: 10d7e7db2a Change-Id: I62cb167f0cf28d2c9327b646eb24a6e7b88e72be
-rw-r--r--Android.mk2
-rw-r--r--proguard.flags3
2 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index b21b98f..8eab88c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -70,6 +70,8 @@ LOCAL_CERTIFICATE := platform
LOCAL_SDK_VERSION := current
+LOCAL_COMPATIBILITY_SUITE := device-tests
+
include $(BUILD_PACKAGE)
include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/proguard.flags b/proguard.flags
index 44f6ccd..ff83f12 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -21,6 +21,9 @@
-keepclassmembers class * {
@com.google.common.annotations.VisibleForTesting *;
}
+-keepclassmembers class * {
+ @com.android.messaging.ui.contact.ContactPickerFragment *;
+}
# Keep methods that have the @VisibleForAnimation annotation
-keep @interface com.android.messaging.annotation.VisibleForAnimation