StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make classes.jar the output of uninstallable Soong Java modules"

Browse Source
This commit is contained in:
David Brazdil
2018-07-09 16:24:16 +00:00
committed by Gerrit Code Review
parent 88a60636b3 a94e4ca2c6
commit cf91546456
1 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/soong_java_prebuilt.mk
View File

@@ -79,6 +79,7 @@ endif
endif # TURBINE_ENABLED != false
ifdef LOCAL_SOONG_DEX_JAR
ifneq ($(LOCAL_UNINSTALLABLE_MODULE),true)
ifndef LOCAL_IS_HOST_MODULE
ifneq ($(filter $(LOCAL_MODULE),$(PRODUCT_BOOT_JARS)),) # is_boot_jar
$(eval $(call hiddenapi-copy-soong-jar,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))
@@ -119,9 +120,14 @@ $(built_odex) : $(dir $(LOCAL_BUILT_MODULE))% : $(common_javalib.jar)
endif
java-dex : $(LOCAL_BUILT_MODULE)
else
else # LOCAL_UNINSTALLABLE_MODULE
$(eval $(call copy-one-file,$(full_classes_jar),$(LOCAL_BUILT_MODULE)))
endif
$(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))
java-dex : $(common_javalib.jar)
endif # LOCAL_UNINSTALLABLE_MODULE
else # LOCAL_SOONG_DEX_JAR
$(eval $(call copy-one-file,$(full_classes_jar),$(LOCAL_BUILT_MODULE)))
endif # LOCAL_SOONG_DEX_JAR
javac-check : $(full_classes_jar)
javac-check-$(LOCAL_MODULE) : $(full_classes_jar)