am 984680ba: Merge "disable emma instrumentation for framework, ext and... (b990f4f4) · Commits · e / os / android_frameworks_base

Android.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -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)

+3 −1

Original line number	Diff line number	Diff line
		@@ -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)