commit f1d2253d52ca18eb78f5639aecfb5a31faf5b751
author Brian Carlstrom <bdc@google.com> Tue Aug 28 15:35:11 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 28 15:35:11 2012 -0700
tree 39a51fe69514273022d69b7e354d241ad2856b03
parent db08d5168e51be52dd50e3bb9015fe69f106fb36
parent 170bf8ee9a4f3df4515bd663def26cd721450012

am 170bf8ee: Merge "Fix build warning."

* commit '170bf8ee9a4f3df4515bd663def26cd721450012':
  Fix build warning.

Android.mk

diff --git a/Android.mk b/Android.mk
index d6520f4..a01d2b8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -54,8 +54,6 @@
 LOCAL_JAVACFLAGS := $(harmony_test_javac_flags)
 LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE := apache-harmony-tests
-LOCAL_NO_EMMA_INSTRUMENT := true
-LOCAL_NO_EMMA_COMPILE := true
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 ifeq ($(WITH_HOST_DALVIK),true)
@@ -66,8 +64,6 @@
     LOCAL_JAVA_LIBRARIES := core-hostdex core-junit-hostdex
     LOCAL_JAVACFLAGS := $(harmony_test_javac_flags)
     LOCAL_MODULE := apache-harmony-tests-hostdex
-    LOCAL_NO_EMMA_INSTRUMENT := true
-    LOCAL_NO_EMMA_COMPILE := true
     LOCAL_BUILD_HOST_DEX := true
     include $(BUILD_HOST_JAVA_LIBRARY)
 endif