p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Fix coverage build." am: e0a367384d 

am: c6cfede3fe

Change-Id: I48f9ee671531c57fd191e84fb8838e5641b0d6f9
This commit is contained in:
allenhair 2017-11-01 17:37:45 +00:00 committed by android-build-merger
parent 1361e7d325 c6cfede3fe
commit d2bd4d1bcf
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/java_common.mk
View File

@ -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)) 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)) LOCAL_JAVA_LIBRARIES := $(filter-out $(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES) $(TARGET_DEFAULT_JAVA_LIBRARIES),$(LOCAL_JAVA_LIBRARIES))
my_system_modules := $(DEFAULT_SYSTEM_MODULES) 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 endif # LOCAL_NO_STANDARD_LIBRARIES
else else
ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true) ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
@ -244,6 +234,19 @@ ifndef LOCAL_IS_HOST_MODULE
endif # current, system_current, or test_current endif # current, system_current, or test_current
endif # LOCAL_SDK_VERSION 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- # In order to compile lambda code javac requires various invokedynamic-
# related classes to be present. This change adds stubs needed for # related classes to be present. This change adds stubs needed for
# javac to compile lambdas. # javac to compile lambdas.