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

Merge changes Ia7feaa13,Ib917761e am: af3984d26d 

am: c11df9e038

Change-Id: If160b8de399bbc77d1a9b7cc0efb37686cf27bea
This commit is contained in:
Colin Cross 2017-12-07 08:50:12 +00:00 committed by android-build-merger
parent 71900fc787 c11df9e038
commit 3f74663fdf
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/soong_java_prebuilt.mk
View File

@ -26,6 +26,8 @@ $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(full_classes_pre_pro
ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
$(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\ $(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\
$(intermediates.COMMON)/jacoco-report-classes.jar)) $(intermediates.COMMON)/jacoco-report-classes.jar))
$(call add-dependency,$(common_javalib.jar),\
$(intermediates.COMMON)/jacoco-report-classes.jar)
endif endif
ifneq ($(TURBINE_DISABLED),false) ifneq ($(TURBINE_DISABLED),false)
@ -41,9 +43,13 @@ ifdef LOCAL_SOONG_DEX_JAR
$(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar))) $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))
$(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar) $(full_classes_header_jar))) $(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar) $(full_classes_header_jar)))
dex_preopt_profile_src_file := $(common_javalib.jar)
# defines built_odex along with rule to install odex # defines built_odex along with rule to install odex
include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk
dex_preopt_profile_src_file :=
ifdef LOCAL_DEX_PREOPT ifdef LOCAL_DEX_PREOPT
ifneq ($(dexpreopt_boot_jar_module),) # boot jar ifneq ($(dexpreopt_boot_jar_module),) # boot jar
# boot jar's rules are defined in dex_preopt.mk # boot jar's rules are defined in dex_preopt.mk