diff options
| author | Guang Zhu <guangzhu@google.com> | 2010-05-18 18:33:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-18 18:33:35 -0700 |
| commit | 984680baff0a7343ea8e5407112b9eb044814f11 (patch) | |
| tree | 9e16f1e6768fa94be71bcad30b08e99e35daf217 | |
| parent | 97f8b171f1633702aa29f38d8462ed0a5a878c15 (diff) | |
| parent | 864feb8dfac48092fd627a3b77ff2c3bf9000357 (diff) | |
| download | frameworks_base-984680baff0a7343ea8e5407112b9eb044814f11.zip frameworks_base-984680baff0a7343ea8e5407112b9eb044814f11.tar.gz frameworks_base-984680baff0a7343ea8e5407112b9eb044814f11.tar.bz2 | |
Merge "disable emma instrumentation for framework, ext and services (DO NOT MERGE)" into kraken
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | services/java/Android.mk | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -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) - |