commit 245592908c5be4c841ce7a93cf0c8e9e6a8e5965
author Ying Wang <wangying@google.com> Mon Aug 27 16:01:38 2012 -0700
committer Ying Wang <wangying@google.com> Mon Aug 27 16:10:28 2012 -0700
tree 1ef5d415603b1cc0820ac1f89c34a390d2e06735
parent cb616cf73671028708c22bf76e47af515d12f485

Keep the emma classes if emma is enabled.

Change-Id: Ie551d48532c61bf610b12875dc33cfe476625c5e

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 9e47dc3..0fccbd3 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -322,6 +322,9 @@
                   -include $(BUILD_SYSTEM)/proguard.flags \
                   -forceprocessing \
                   -printmapping $(proguard_dictionary)
+ifeq ($(LOCAL_EMMA_INSTRUMENT),true)
+proguard_flags += -include $(BUILD_SYSTEM)/proguard.emma.flags
+endif
 # If this is a test package, add proguard keep flags for tests.
 ifneq ($(strip $(LOCAL_INSTRUMENTATION_FOR)$(filter tests,$(LOCAL_MODULE_TAGS))$(filter android.test.runner,$(LOCAL_JAVA_LIBRARIES))),)
 proguard_flags := $(proguard_flags) -include $(BUILD_SYSTEM)/proguard_tests.flags