summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaman Tenneti <rtenneti@google.com>2019-02-27 14:52:28 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-27 14:52:28 -0800
commit62f573f1efb7f8d9304ad2c3e77b273badb0906c (patch)
tree1687d6ee4e1d5e645a649894e69f3d005b28fbd7
parentbb9b93a2a6c524afa75c55a377bfaf591759d48e (diff)
parentbada9f9b46ecd526e478d343eeb80f97962fb0eb (diff)
downloadandroid_packages_apps_Messaging-62f573f1efb7f8d9304ad2c3e77b273badb0906c.tar.gz
android_packages_apps_Messaging-62f573f1efb7f8d9304ad2c3e77b273badb0906c.tar.bz2
android_packages_apps_Messaging-62f573f1efb7f8d9304ad2c3e77b273badb0906c.zip
AOSP/Messaging - Added LOCAL_COMPATIBILITY_SUITE := device-tests to fix "Missing test_suite setting for test".
am: bada9f9b46 Change-Id: I9e4443ddc278dd1f5bb3cd42dac451578538e2f8
-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