tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add support for jacoco in soong" am: 9798690282

Browse source 
am: 863dcf07d4

Change-Id: I7c8f67093167c75318ef8ba7b0bc86077434f25f
This commit is contained in:
Colin Cross 2017-11-28 21:25:23 +00:00 committed by android-build-merger
commit f58de03da6
4 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/clear_vars.mk
View file

@ -227,6 +227,9 @@ LOCAL_SDK_RES_VERSION:=
LOCAL_SDK_VERSION:= LOCAL_SDK_VERSION:=
LOCAL_SHARED_ANDROID_LIBRARIES:= LOCAL_SHARED_ANDROID_LIBRARIES:=
LOCAL_SHARED_LIBRARIES:= LOCAL_SHARED_LIBRARIES:=
LOCAL_SOONG_HEADER_JAR :=
LOCAL_SOONG_DEX_JAR :=
LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=
# '',true # '',true
LOCAL_SOURCE_FILES_ALL_GENERATED:= LOCAL_SOURCE_FILES_ALL_GENERATED:=
LOCAL_SRC_FILES:= LOCAL_SRC_FILES:=

1
core/config.mk
View file

@ -658,7 +658,6 @@ RELOCATION_PACKER := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/relocation
FINDBUGS_DIR := external/owasp/sanitizer/tools/findbugs/bin FINDBUGS_DIR := external/owasp/sanitizer/tools/findbugs/bin
FINDBUGS := $(FINDBUGS_DIR)/findbugs FINDBUGS := $(FINDBUGS_DIR)/findbugs
JACOCO_CLI_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jacoco-cli$(COMMON_JAVA_PACKAGE_SUFFIX)
# Tool to merge AndroidManifest.xmls # Tool to merge AndroidManifest.xmls
ANDROID_MANIFEST_MERGER_CLASSPATH := \ ANDROID_MANIFEST_MERGER_CLASSPATH := \

1
core/jacoco.mk
View file

@ -21,7 +21,6 @@
# determine Jacoco include/exclude filters even when coverage is not enabled # determine Jacoco include/exclude filters even when coverage is not enabled
# to get syntax checking on LOCAL_JACK_COVERAGE_(INCLUDE|EXCLUDE)_FILTER # to get syntax checking on LOCAL_JACK_COVERAGE_(INCLUDE|EXCLUDE)_FILTER
DEFAULT_JACOCO_EXCLUDE_FILTER := org/junit/*,org/jacoco/*,org/mockito/*
# copy filters from Jack but also skip some known java packages # copy filters from Jack but also skip some known java packages
my_include_filter := $(strip $(LOCAL_JACK_COVERAGE_INCLUDE_FILTER)) my_include_filter := $(strip $(LOCAL_JACK_COVERAGE_INCLUDE_FILTER))
my_exclude_filter := $(strip $(DEFAULT_JACOCO_EXCLUDE_FILTER),$(LOCAL_JACK_COVERAGE_EXCLUDE_FILTER)) my_exclude_filter := $(strip $(DEFAULT_JACOCO_EXCLUDE_FILTER),$(LOCAL_JACK_COVERAGE_EXCLUDE_FILTER))

16
core/soong_java_prebuilt.mk
View file

@ -2,6 +2,7 @@
# Extra inputs: # Extra inputs:
# LOCAL_SOONG_HEADER_JAR # LOCAL_SOONG_HEADER_JAR
# LOCAL_SOONG_DEX_JAR # LOCAL_SOONG_DEX_JAR
# LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)) ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
$(call pretty-error,soong_java_prebuilt.mk may only be used from Soong) $(call pretty-error,soong_java_prebuilt.mk may only be used from Soong)
@ -18,13 +19,12 @@ full_classes_jar := $(intermediates.COMMON)/classes.jar
full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar
common_javalib.jar := $(intermediates.COMMON)/javalib.jar common_javalib.jar := $(intermediates.COMMON)/javalib.jar
LOCAL_FULL_CLASSES_PRE_JACOCO_JAR := $(LOCAL_PREBUILT_MODULE_FILE) $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(full_classes_jar)))
####################################### ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
include $(BUILD_SYSTEM)/jacoco.mk $(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\
####################################### $(intermediates.COMMON)/jacoco-report-classes.jar))
endif
$(eval $(call copy-one-file,$(LOCAL_FULL_CLASSES_JACOCO_JAR),$(full_classes_jar)))
ifneq ($(TURBINE_DISABLED),false) ifneq ($(TURBINE_DISABLED),false)
ifdef LOCAL_SOONG_HEADER_JAR ifdef LOCAL_SOONG_HEADER_JAR
@ -94,7 +94,3 @@ my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX)
my_common := COMMON my_common := COMMON
include $(BUILD_SYSTEM)/link_type.mk include $(BUILD_SYSTEM)/link_type.mk
endif # !LOCAL_IS_HOST_MODULE endif # !LOCAL_IS_HOST_MODULE
# Built in equivalent to include $(CLEAR_VARS)
LOCAL_SOONG_HEADER_JAR :=
LOCAL_SOONG_DEX_JAR :=