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

Merge "Move jacoco before desugar" am: f9a1e6a72a 

am: c06ecd9a99

Change-Id: If465e2dcac6fa905210ae2905b453b903581418d
This commit is contained in:
Colin Cross 2018-01-03 21:01:38 +00:00 committed by android-build-merger
parent b305326ae4 c06ecd9a99
commit 2fec0b5d97
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/java.mk
View File

@ -558,6 +558,12 @@ endif
$(eval $(call copy-one-file,$(full_classes_jarjar_jar),$(full_classes_jar))) $(eval $(call copy-one-file,$(full_classes_jarjar_jar),$(full_classes_jar)))
LOCAL_FULL_CLASSES_PRE_JACOCO_JAR := $(full_classes_jar)
#######################################
include $(BUILD_SYSTEM)/jacoco.mk
#######################################
# Temporarily enable --multi-dex until proguard supports v53 class files # Temporarily enable --multi-dex until proguard supports v53 class files
# ( http://b/67673860 ) or we move away from proguard altogether. # ( http://b/67673860 ) or we move away from proguard altogether.
ifdef TARGET_OPENJDK9 ifdef TARGET_OPENJDK9
@ -569,7 +575,7 @@ my_desugaring :=
ifndef LOCAL_IS_STATIC_JAVA_LIBRARY ifndef LOCAL_IS_STATIC_JAVA_LIBRARY
my_desugaring := true my_desugaring := true
$(full_classes_desugar_jar): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS) $(full_classes_desugar_jar): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS)
$(full_classes_desugar_jar): $(full_classes_jar) $(full_java_header_libs) $(DESUGAR) $(full_classes_desugar_jar): $(LOCAL_FULL_CLASSES_JACOCO_JAR) $(full_java_header_libs) $(DESUGAR)
$(desugar-classes-jar) $(desugar-classes-jar)
endif endif
else else
@ -577,16 +583,10 @@ my_desugaring :=
endif endif
ifndef my_desugaring ifndef my_desugaring
full_classes_desugar_jar := $(full_classes_jar) full_classes_desugar_jar := $(LOCAL_FULL_CLASSES_JACOCO_JAR)
endif endif
LOCAL_FULL_CLASSES_PRE_JACOCO_JAR := $(full_classes_desugar_jar) full_classes_pre_proguard_jar := $(full_classes_desugar_jar)
#######################################
include $(BUILD_SYSTEM)/jacoco.mk
#######################################
full_classes_pre_proguard_jar := $(LOCAL_FULL_CLASSES_JACOCO_JAR)
# Keep a copy of the jar just before proguard processing. # Keep a copy of the jar just before proguard processing.
$(eval $(call copy-one-file,$(full_classes_pre_proguard_jar),$(intermediates.COMMON)/classes-pre-proguard.jar)) $(eval $(call copy-one-file,$(full_classes_pre_proguard_jar),$(intermediates.COMMON)/classes-pre-proguard.jar))