Re-enable Jack for Messaging and its tests

Jack was disabled because of bugs in Jack and missing support for testing
obfuscated applications. Both are now fixed so Jack can be enabled.

Bug: 27215871

Change-Id: I7c437906fe78e1a97204f5e26059966198b15ac1
This commit is contained in:
Yohann Roussel
2016-02-17 16:30:35 +01:00
parent 0c38f114c1
commit bf6bd40faa
3 changed files with 1 additions and 5 deletions

View File

@@ -75,8 +75,6 @@ else
LOCAL_PROGUARD_FLAG_FILES += proguard-release.flags LOCAL_PROGUARD_FLAG_FILES += proguard-release.flags
endif endif
LOCAL_JACK_ENABLED := disabled
LOCAL_PACKAGE_NAME := messaging LOCAL_PACKAGE_NAME := messaging
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform

View File

@@ -23,7 +23,7 @@
} }
# Keep methods that have the @VisibleForAnimation annotation # Keep methods that have the @VisibleForAnimation annotation
-keep @interface com.android.messaging.annotation.VisibleForAnimation -keep interface com.android.messaging.annotation.VisibleForAnimation
-keepclassmembers class * { -keepclassmembers class * {
@com.android.messaging.annotation.VisibleForAnimation *; @com.android.messaging.annotation.VisibleForAnimation *;
} }

View File

@@ -24,8 +24,6 @@ LOCAL_PACKAGE_NAME := messagingtests
LOCAL_INSTRUMENTATION_FOR := messaging LOCAL_INSTRUMENTATION_FOR := messaging
LOCAL_JACK_ENABLED := disabled
# Matching ../Android.mk # Matching ../Android.mk
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current