commit 1fd6e22b6a6c02f1c7a649a2c9caf419cf47e120
author Ying Wang <wangying@google.com> Wed Aug 22 15:27:43 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 22 15:27:43 2012 -0700
tree aae9457b78956abe40fc8ecacee8c3f6ea953098
parent 8acdf6962852c3fb09ecc058f858022c24de9b94
parent 510aa89ca32d120f60fd8186b9575dc74b57aada

am 510aa89c: am 9f814ac5: Merge "Remove obsolete variables." into jb-mr1-dev

* commit '510aa89ca32d120f60fd8186b9575dc74b57aada':
  Remove obsolete variables.

Android.mk

diff --git a/Android.mk b/Android.mk
index 3f9b69b5..2d05ca0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -237,9 +237,6 @@
 LOCAL_MODULE := framework
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
-LOCAL_NO_EMMA_INSTRUMENT := true
-LOCAL_NO_EMMA_COMPILE := true
-
 # List of classes and interfaces which should be loaded by the Zygote.
 LOCAL_JAVA_RESOURCE_FILES += $(LOCAL_PATH)/preloaded-classes
 
@@ -755,9 +752,6 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := ext
 
-LOCAL_NO_EMMA_INSTRUMENT := true
-LOCAL_NO_EMMA_COMPILE := true
-
 LOCAL_DX_FLAGS := --core-library
 
 include $(BUILD_JAVA_LIBRARY)

services/java/Android.mk

diff --git a/services/java/Android.mk b/services/java/Android.mk
index e70a6c9..95b28d9 100644
--- a/services/java/Android.mk
+++ b/services/java/Android.mk
@@ -13,9 +13,6 @@
 
 LOCAL_JAVA_LIBRARIES := android.policy telephony-common
 
-LOCAL_NO_EMMA_INSTRUMENT := true
-LOCAL_NO_EMMA_COMPILE := true
-
 include $(BUILD_JAVA_LIBRARY)
 
 include $(BUILD_DROIDDOC)