Re-enable Jack for Messaging and its tests

am: bf6bd40faa

* commit 'bf6bd40faa264ec2727a4b23e6e4b72815ec5518':
  Re-enable Jack for Messaging and its tests
This commit is contained in:
Yohann Roussel
2016-02-19 08:57:42 +00:00
committed by android-build-merger
3 changed files with 1 additions and 5 deletions
-2
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
+1 -1
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 *;
} }
-2
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