Merge "Fix coverage build." (c6cfede3) · Commits · e / os / android_build

core/java_common.mk

+13 −10

Original line number	Diff line number	Diff line
		@@ -213,16 +213,6 @@ ifndef LOCAL_IS_HOST_MODULE
		full_java_bootclasspath_libs := $(call java-lib-header-files,$(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES) $(TARGET_DEFAULT_JAVA_LIBRARIES))
		LOCAL_JAVA_LIBRARIES := $(filter-out $(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES) $(TARGET_DEFAULT_JAVA_LIBRARIES),$(LOCAL_JAVA_LIBRARIES))
		my_system_modules := $(DEFAULT_SYSTEM_MODULES)
		ifneq ($(LOCAL_MODULE),jacocoagent)
		ifeq ($(EMMA_INSTRUMENT),true)
		ifneq ($(EMMA_INSTRUMENT_STATIC),true)
		# For instrumented build, if Jacoco is not being included statically
		# in instrumented packages then include Jacoco classes into the
		# bootclasspath.
		full_java_bootclasspath_libs += $(call java-lib-header-files,jacocoagent)
		endif # EMMA_INSTRUMENT_STATIC
		endif # EMMA_INSTRUMENT
		endif # LOCAL_MODULE == jacocoagent
		endif # LOCAL_NO_STANDARD_LIBRARIES
		else
		ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
		@@ -244,6 +234,19 @@ ifndef LOCAL_IS_HOST_MODULE
		endif # current, system_current, or test_current
		endif # LOCAL_SDK_VERSION

		ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
		ifneq ($(LOCAL_MODULE),jacocoagent)
		ifeq ($(EMMA_INSTRUMENT),true)
		ifneq ($(EMMA_INSTRUMENT_STATIC),true)
		# For instrumented build, if Jacoco is not being included statically
		# in instrumented packages then include Jacoco classes into the
		# bootclasspath.
		full_java_bootclasspath_libs += $(call java-lib-header-files,jacocoagent)
		endif # EMMA_INSTRUMENT_STATIC
		endif # EMMA_INSTRUMENT
		endif # LOCAL_MODULE == jacocoagent
		endif # LOCAL_NO_STANDARD_LIBRARIES

		# In order to compile lambda code javac requires various invokedynamic-
		# related classes to be present. This change adds stubs needed for
		# javac to compile lambdas.