From bf6bd40faa264ec2727a4b23e6e4b72815ec5518 Mon Sep 17 00:00:00 2001
From: Yohann Roussel <yroussel@google.com>
Date: Wed, 17 Feb 2016 16:30:35 +0100
Subject: [PATCH] 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
---
 Android.mk       | 2 --
 proguard.flags   | 2 +-
 tests/Android.mk | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Android.mk b/Android.mk
index 725c89d..e2ed18b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -75,8 +75,6 @@ else
     LOCAL_PROGUARD_FLAG_FILES += proguard-release.flags
 endif
 
-LOCAL_JACK_ENABLED := disabled
-
 LOCAL_PACKAGE_NAME := messaging
 
 LOCAL_CERTIFICATE := platform
diff --git a/proguard.flags b/proguard.flags
index 759f2d4..76b033c 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -23,7 +23,7 @@
 }
 
 # Keep methods that have the @VisibleForAnimation annotation
--keep @interface com.android.messaging.annotation.VisibleForAnimation
+-keep interface com.android.messaging.annotation.VisibleForAnimation
 -keepclassmembers class * {
   @com.android.messaging.annotation.VisibleForAnimation *;
 }
diff --git a/tests/Android.mk b/tests/Android.mk
index f3f4752..3bfdb9a 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -24,8 +24,6 @@ LOCAL_PACKAGE_NAME := messagingtests
 
 LOCAL_INSTRUMENTATION_FOR := messaging
 
-LOCAL_JACK_ENABLED := disabled
-
 # Matching ../Android.mk
 LOCAL_SDK_VERSION := current