Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disable emma instrumentation for framework, ext and services (DO NOT MERGE)" into kraken

Browse Source
This commit is contained in:
Guang Zhu
2010-05-18 18:33:35 -07:00
committed by Android (Google) Code Review
parent 97f8b171f1 864feb8dfa
commit 984680baff
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Android.mk
View File

@@ -198,6 +198,9 @@ LOCAL_JAVA_LIBRARIES := core ext
LOCAL_MODULE := framework LOCAL_MODULE := framework
LOCAL_MODULE_CLASS := JAVA_LIBRARIES 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. # List of classes and interfaces which should be loaded by the Zygote.
LOCAL_JAVA_RESOURCE_FILES += $(LOCAL_PATH)/preloaded-classes LOCAL_JAVA_RESOURCE_FILES += $(LOCAL_PATH)/preloaded-classes
@@ -596,6 +599,9 @@ LOCAL_JAVA_LIBRARIES := core
LOCAL_MODULE := ext LOCAL_MODULE := ext
LOCAL_NO_EMMA_INSTRUMENT := true
LOCAL_NO_EMMA_COMPILE := true
include $(BUILD_JAVA_LIBRARY) include $(BUILD_JAVA_LIBRARY)

4
services/java/Android.mk
View File

@@ -13,7 +13,9 @@ LOCAL_MODULE:= services
LOCAL_JAVA_LIBRARIES := android.policy LOCAL_JAVA_LIBRARIES := android.policy
LOCAL_NO_EMMA_INSTRUMENT := true
LOCAL_NO_EMMA_COMPILE := true
include $(BUILD_JAVA_LIBRARY) include $(BUILD_JAVA_LIBRARY)
include $(BUILD_DROIDDOC) include $(BUILD_DROIDDOC)