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

Merge "Add dependencies on classes.jar for soong modules" am: 8bef6515da am: 00550036f8 

am: d6badc7244

Change-Id: I584a599a1c6b2bca1f3eb7d8e35001f8ab8a9bc7
This commit is contained in:
Colin Cross 2017-10-20 23:17:42 +00:00 committed by android-build-merger
parent dccef8792d d6badc7244
commit 36b6794350
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/soong_java_prebuilt.mk
View File

@ -37,6 +37,7 @@ endif # TURBINE_DISABLED != false
ifdef LOCAL_SOONG_DEX_JAR ifdef LOCAL_SOONG_DEX_JAR
ifndef LOCAL_IS_HOST_MODULE ifndef LOCAL_IS_HOST_MODULE
$(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)))
# 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
@ -62,6 +63,7 @@ $(built_odex) : $(dir $(LOCAL_BUILT_MODULE))% : $(common_javalib.jar)
endif # LOCAL_DEX_PREOPT endif # LOCAL_DEX_PREOPT
else # LOCAL_IS_HOST_MODULE else # LOCAL_IS_HOST_MODULE
$(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(LOCAL_BUILT_MODULE))) $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(LOCAL_BUILT_MODULE)))
$(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(full_classes_jar) $(full_classes_header_jar)))
endif endif
java-dex : $(LOCAL_BUILT_MODULE) java-dex : $(LOCAL_BUILT_MODULE)