From ddcca31997bc28d2305366a9fca6029288a12fa8 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 21 Aug 2012 17:23:00 -0700 Subject: [PATCH] Remove obsolete variables. Bug: 6987838 Now emma is only enabled for apks. Change-Id: Id8d198467076a8dff705195a8e051f3fb00d5660 --- Android.mk | 6 ------ services/java/Android.mk | 3 --- 2 files changed, 9 deletions(-) diff --git a/Android.mk b/Android.mk index c2331f2f0406..0665e60cb007 100644 --- a/Android.mk +++ b/Android.mk @@ -237,9 +237,6 @@ LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit ext 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 @@ -725,9 +722,6 @@ LOCAL_JAVA_RESOURCE_DIRS := $(ext_res_dirs) 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) diff --git a/services/java/Android.mk b/services/java/Android.mk index e70a6c96bece..95b28d981b6f 100644 --- a/services/java/Android.mk +++ b/services/java/Android.mk @@ -13,9 +13,6 @@ LOCAL_MODULE:= services LOCAL_JAVA_LIBRARIES := android.policy telephony-common -LOCAL_NO_EMMA_INSTRUMENT := true -LOCAL_NO_EMMA_COMPILE := true - include $(BUILD_JAVA_LIBRARY) include $(BUILD_DROIDDOC) -- 2.11.0