From 864feb8dfac48092fd627a3b77ff2c3bf9000357 Mon Sep 17 00:00:00 2001 From: Guang Zhu Date: Tue, 16 Mar 2010 19:08:54 -0700 Subject: disable emma instrumentation for framework, ext and services (DO NOT MERGE) When these libraries are instrumented with emma instructions, runtime keeps restarting on native crashes. To acheive a fully emma instrumented build, we need to disable emma instrumentation on these libraries. Change-Id: I51cb3bf71e0e348264fe5f21a27085fb2b9e6670 --- Android.mk | 6 ++++++ services/java/Android.mk | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index a7fbcdf..5c95d20 100644 --- a/Android.mk +++ b/Android.mk @@ -198,6 +198,9 @@ LOCAL_JAVA_LIBRARIES := core 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 @@ -596,6 +599,9 @@ LOCAL_JAVA_LIBRARIES := core LOCAL_MODULE := ext +LOCAL_NO_EMMA_INSTRUMENT := true +LOCAL_NO_EMMA_COMPILE := true + include $(BUILD_JAVA_LIBRARY) diff --git a/services/java/Android.mk b/services/java/Android.mk index 934712c..c756d29 100644 --- a/services/java/Android.mk +++ b/services/java/Android.mk @@ -13,7 +13,9 @@ LOCAL_MODULE:= services LOCAL_JAVA_LIBRARIES := android.policy +LOCAL_NO_EMMA_INSTRUMENT := true +LOCAL_NO_EMMA_COMPILE := true + include $(BUILD_JAVA_LIBRARY) include $(BUILD_DROIDDOC) - -- cgit v1.1