openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
platform_build/core/soong_java_prebuilt.mk

177 lines
6.7 KiB
Makefile
Raw Normal View History

Use soong_java_prebuilt.mk to export soong jars to java Instead of trying to squeeze soong jars through prebuilt_internal.mk, make a separate soong_java_prebuilt.mk. Test: m -j checkbuild Change-Id: I078e67ce58b2b2e0acf4b1ec28823e96b16a0cec
2017-09-08 04:21:51 +08:00
# Java prebuilt coming from Soong.
# Extra inputs:
Move dexpreopting to Soong Move the dexpreopting logic into Soong. Make modules will be dexpreopted by executing the Soong logic in the standalone dexpreopt_gen binary, which will generate scripts that will perform dexpreopting for each module. Export global configuration as JSON to $OUT/dexpreopt.config, which will be used by dexpreopt_gen and Soong, and per-module JSON configuration that will be used by dexpreopt_gen. This relands I59b20c931ee3e5a8d35eb30da4148691c5095502, I39d580999947ee54cfefe875b57a028be5333bd7, Ie7daa94e107d53eff075ca58dbe721bd9d7fc8c2 and Ica006a007d112c232311435aaac0c0e476232b67, with a minor update to match the changes made to dexpreopt_gen arguments and a fix to correctly keep dexpreopt disabled on mac builds. Bug: 119412419 Bug: 120273280 Test: no differences to dexpreopt outputs on aosp_sailfish system/, only expected changes to dexpreopt outputs on system_other (.vdex files for privileged Soong modules no longer incorrectly contain .dex contents). Change-Id: I25163e91886cea6941afa25cdb529ed053278dcb
2018-11-17 13:26:33 +08:00
# LOCAL_SOONG_BUILT_INSTALLED
# LOCAL_SOONG_CLASSES_JAR
Use soong_java_prebuilt.mk to export soong jars to java Instead of trying to squeeze soong jars through prebuilt_internal.mk, make a separate soong_java_prebuilt.mk. Test: m -j checkbuild Change-Id: I078e67ce58b2b2e0acf4b1ec28823e96b16a0cec
2017-09-08 04:21:51 +08:00
# LOCAL_SOONG_HEADER_JAR
Make soong_java_prebuilt.mk accept dex jars Accept LOCAL_SOONG_DEX_JAR and copy it to javalib.jar. Test: m -j checkbuild Change-Id: I28f9e99fe19110cab188a9129b058db532aa273f
2017-09-13 04:41:20 +08:00
# LOCAL_SOONG_DEX_JAR
Add support for jacoco in soong Use jacoco values exported from soong and copy jacoco-report-classes.jar to where the jacoco-report-classes-all.jar rule can find it. Bug: 69629238 Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false Change-Id: If05381f415fb52a575746b8be0bfcd03d55b2153
2017-11-23 08:04:55 +08:00
# LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
Use soong_java_prebuilt.mk to export soong jars to java Instead of trying to squeeze soong jars through prebuilt_internal.mk, make a separate soong_java_prebuilt.mk. Test: m -j checkbuild Change-Id: I078e67ce58b2b2e0acf4b1ec28823e96b16a0cec
2017-09-08 04:21:51 +08:00
ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
$(call pretty-error,soong_java_prebuilt.mk may only be used from Soong)
endif
LOCAL_MODULE_SUFFIX := .jar
LOCAL_BUILT_MODULE_STEM := javalib.jar
Build aar files for m <module name> Test: m SystemUI-core Change-Id: I0bee792d1af80abb3e74c278db488bd668bd1fb4
2019-01-30 07:07:46 +08:00
intermediates.COMMON := $(call local-intermediates-dir,COMMON)
Use soong_java_prebuilt.mk to export soong jars to java Instead of trying to squeeze soong jars through prebuilt_internal.mk, make a separate soong_java_prebuilt.mk. Test: m -j checkbuild Change-Id: I078e67ce58b2b2e0acf4b1ec28823e96b16a0cec
2017-09-08 04:21:51 +08:00
full_classes_jar := $(intermediates.COMMON)/classes.jar
Copy soong java prebuilts to classes-pre-proguard.jar Some robolectric rules assume that classes-pre-proguard.jar exists. Soong doesn't support proguard yet, so copy classes.jar to classes-pre-proguard.jar for now. Bug: 69917341 Test: m checkbuild tests Change-Id: I818363ec13c2e5e1c4ab5bd6389ea4687de953eb
2017-11-30 12:44:11 +08:00
full_classes_pre_proguard_jar := $(intermediates.COMMON)/classes-pre-proguard.jar
Use soong_java_prebuilt.mk to export soong jars to java Instead of trying to squeeze soong jars through prebuilt_internal.mk, make a separate soong_java_prebuilt.mk. Test: m -j checkbuild Change-Id: I078e67ce58b2b2e0acf4b1ec28823e96b16a0cec
2017-09-08 04:21:51 +08:00
full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar
Make soong_java_prebuilt.mk accept dex jars Accept LOCAL_SOONG_DEX_JAR and copy it to javalib.jar. Test: m -j checkbuild Change-Id: I28f9e99fe19110cab188a9129b058db532aa273f
2017-09-13 04:41:20 +08:00
common_javalib.jar := $(intermediates.COMMON)/javalib.jar
Use soong_java_prebuilt.mk to export soong jars to java Instead of trying to squeeze soong jars through prebuilt_internal.mk, make a separate soong_java_prebuilt.mk. Test: m -j checkbuild Change-Id: I078e67ce58b2b2e0acf4b1ec28823e96b16a0cec
2017-09-08 04:21:51 +08:00
Build aar files for m <module name> Test: m SystemUI-core Change-Id: I0bee792d1af80abb3e74c278db488bd668bd1fb4
2019-01-30 07:07:46 +08:00
ifdef LOCAL_SOONG_AAR
LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_AAR)
endif
#######################################
include $(BUILD_SYSTEM)/base_rules.mk
#######################################
Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk Simplify importing Soong modules into Make by always copying LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets Soong pick the final output file instead of trying to figure out which of the various intermediate files should be the output file. Also fixes an issue where hostdex modules could attempt to copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE), which are the same file for host java modules. Test: set compile_dex:true on core.platform.api.stubs. no warnings of target overriding Test: m checkbuild Change-Id: I2e089012436fe8649db82a673d446d1c5a73a731
2019-01-15 06:10:20 +08:00
ifdef LOCAL_SOONG_CLASSES_JAR
$(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_jar)))
$(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_pre_proguard_jar)))
$(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(full_classes_jar)))
ifneq ($(TURBINE_ENABLED),false)
ifdef LOCAL_SOONG_HEADER_JAR
$(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar)))
else
$(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar)))
endif
endif # TURBINE_ENABLED != false
endif
$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))
Use soong_java_prebuilt.mk to export soong jars to java Instead of trying to squeeze soong jars through prebuilt_internal.mk, make a separate soong_java_prebuilt.mk. Test: m -j checkbuild Change-Id: I078e67ce58b2b2e0acf4b1ec28823e96b16a0cec
2017-09-08 04:21:51 +08:00
Add support for jacoco in soong Use jacoco values exported from soong and copy jacoco-report-classes.jar to where the jacoco-report-classes-all.jar rule can find it. Bug: 69629238 Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false Change-Id: If05381f415fb52a575746b8be0bfcd03d55b2153
2017-11-23 08:04:55 +08:00
ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
$(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\
$(intermediates.COMMON)/jacoco-report-classes.jar))
Add dependency on jacoco-report-classes.jar jacoco-report-classes.jar is found by a glob, so there is no explicit dependency on it. Add a dependency to javalib.jar so that it gets installed. Bug: 70295664 Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_STATIC=true WITH_DEXPREPOT=false Change-Id: Ia7feaa132879539f88c08a49148e4bbb5a141eab
2017-12-07 08:09:49 +08:00
$(call add-dependency,$(common_javalib.jar),\
$(intermediates.COMMON)/jacoco-report-classes.jar)
Add support for jacoco in soong Use jacoco values exported from soong and copy jacoco-report-classes.jar to where the jacoco-report-classes-all.jar rule can find it. Bug: 69629238 Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false Change-Id: If05381f415fb52a575746b8be0bfcd03d55b2153
2017-11-23 08:04:55 +08:00
endif
Use soong_java_prebuilt.mk to export soong jars to java Instead of trying to squeeze soong jars through prebuilt_internal.mk, make a separate soong_java_prebuilt.mk. Test: m -j checkbuild Change-Id: I078e67ce58b2b2e0acf4b1ec28823e96b16a0cec
2017-09-08 04:21:51 +08:00
Support LOCAL_SOONG_PROGUARD_DICT in soong_java_prebuilt.mk Test: m checkbuild Change-Id: I60a14be7d8bc4992b0519397b0e1933819f6e773
2019-04-24 04:02:43 +08:00
ifdef LOCAL_SOONG_PROGUARD_DICT
$(eval $(call copy-one-file,$(LOCAL_SOONG_PROGUARD_DICT),\
$(intermediates.COMMON)/proguard_dictionary))
$(call add-dependency,$(LOCAL_BUILT_MODULE),\
$(intermediates.COMMON)/proguard_dictionary)
endif
Allow soong java libraries to include exported resources and proguard flags Test: m checkbuild Change-Id: Ia02f816084d0eb1c0e0f20e1ecd57aaf3778874c
2018-02-21 09:21:36 +08:00
ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE
Allow Soong to export multiple proguard flags files Soong uses lists of proguard flags files from dependencies instead of a single concatenated file. Allow Soong to pass the list to make, which will concatenate it. Move the check inside ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE in case Soong exports an Android library with an empty LOCAL_SOONG_EXPORT_PROGUARD_FLAGS. Bug: 73724997 Test: m checkbuild Change-Id: Ia8f229ec5f9fc99a23bd471dfa70c9de7316de94
2018-05-01 06:59:16 +08:00
my_res_package := $(intermediates.COMMON)/package-res.apk
Allow soong java libraries to include exported resources and proguard flags Test: m checkbuild Change-Id: Ia02f816084d0eb1c0e0f20e1ecd57aaf3778874c
2018-02-21 09:21:36 +08:00
Allow Soong to export multiple proguard flags files Soong uses lists of proguard flags files from dependencies instead of a single concatenated file. Allow Soong to pass the list to make, which will concatenate it. Move the check inside ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE in case Soong exports an Android library with an empty LOCAL_SOONG_EXPORT_PROGUARD_FLAGS. Bug: 73724997 Test: m checkbuild Change-Id: Ia8f229ec5f9fc99a23bd471dfa70c9de7316de94
2018-05-01 06:59:16 +08:00
$(my_res_package): $(LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE)
Fix echo when copying package-res.apk Bug: 73724997 Test: m checkbuild Change-Id: Iad9f46e01c40d1993e279c6ea6dd9c60932064c8
2018-04-20 05:19:52 +08:00
@echo "Copy: $@"
Allow soong java libraries to include exported resources and proguard flags Test: m checkbuild Change-Id: Ia02f816084d0eb1c0e0f20e1ecd57aaf3778874c
2018-02-21 09:21:36 +08:00
$(copy-file-to-target)
Allow Soong to export multiple proguard flags files Soong uses lists of proguard flags files from dependencies instead of a single concatenated file. Allow Soong to pass the list to make, which will concatenate it. Move the check inside ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE in case Soong exports an Android library with an empty LOCAL_SOONG_EXPORT_PROGUARD_FLAGS. Bug: 73724997 Test: m checkbuild Change-Id: Ia8f229ec5f9fc99a23bd471dfa70c9de7316de94
2018-05-01 06:59:16 +08:00
$(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_res_package))
my_proguard_flags := $(intermediates.COMMON)/export_proguard_flags
$(my_proguard_flags): $(LOCAL_SOONG_EXPORT_PROGUARD_FLAGS)
@echo "Export proguard flags: $@"
rm -f $@
touch $@
for f in $+; do \
echo -e "\n# including $$f" >>$@; \
cat $$f >>$@; \
done
$(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_proguard_flags))
Allow soong java libraries to include exported resources and proguard flags Test: m checkbuild Change-Id: Ia02f816084d0eb1c0e0f20e1ecd57aaf3778874c
2018-02-21 09:21:36 +08:00
Regenerate R.java files from LOCAL_STATIC_ANDROID_LIBRARIES If a static android library lib1 has LOCAL_STATIC_ANDROID_LIBRARIES lib2, then the R.class files for packages in lib2 will be merged into the jar for lib1. If an app has lib1 in its LOCAL_STATIC_ANDROID_LIBRARIES it will get the R.class files from lib2 through lib1, instead of regenerating the R.java files with numbering that matches the resource table of the app. This was worked around for support libraries by keeping a fix_dependencies.mk that added transitive static support libraries to the direct static dependencies of apps. Instead, propagate the packages that aapt2 generated R.java files for up as --extra-packages arguments to the next aapt2 invocation, which will force aapt2 to regenerate the R.java files for those packages. Bug: 78300023 Test: m checkbuild Change-Id: I7375e13241b4c4f2933032409fb7935abe133bfc
2018-05-03 03:52:43 +08:00
my_static_library_extra_packages := $(intermediates.COMMON)/extra_packages
$(eval $(call copy-one-file,$(LOCAL_SOONG_STATIC_LIBRARY_EXTRA_PACKAGES),$(my_static_library_extra_packages)))
$(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_static_library_extra_packages))
Merge LOCAL_STATIC_ANDROID_LIBRARIES manifests Pass LOCAL_STATIC_ANDROID_LIBRARIES to ManifestMerger, and copy manifests for prebuilts AARs and static android libraries to $(intermediates.COMMON)/manifest/AndroidManifest.xml. Bug: 78447299 Test: m java Change-Id: I02ac29d3445fcd591101ff0ce215e60dd0997224 Merged-In: I02ac29d3445fcd591101ff0ce215e60dd0997224 Merged-In: Ib20aa4849978283f1da1ce601b28199fc0183e05
2018-06-08 07:44:07 +08:00
my_static_library_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml
$(eval $(call copy-one-file,$(LOCAL_FULL_MANIFEST_FILE),$(my_static_library_android_manifest)))
$(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_static_library_android_manifest))
Allow soong java libraries to include exported resources and proguard flags Test: m checkbuild Change-Id: Ia02f816084d0eb1c0e0f20e1ecd57aaf3778874c
2018-02-21 09:21:36 +08:00
endif # LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE
dex_preopt: differentiate between updatable boot jars and non-updatable boot jars. bug: 119868597 Test: m Change-Id: I2f12ed6f37b629effc30e7b0c3310dc32e5ff4c8
2019-01-15 19:46:32 +08:00
Make soong_java_prebuilt.mk accept dex jars Accept LOCAL_SOONG_DEX_JAR and copy it to javalib.jar. Test: m -j checkbuild Change-Id: I28f9e99fe19110cab188a9129b058db532aa273f
2017-09-13 04:41:20 +08:00
ifdef LOCAL_SOONG_DEX_JAR
dex_preopt: differentiate between updatable boot jars and non-updatable boot jars. bug: 119868597 Test: m Change-Id: I2f12ed6f37b629effc30e7b0c3310dc32e5ff4c8
2019-01-15 19:46:32 +08:00
ifndef LOCAL_IS_HOST_MODULE
Use two-column format for PRODUCT_BOOT_JARS components. The first component is the apex name, or a special name "platform" if the boot jar is a platform jar rather than a part of some apex. This is a prerequisite change for moving core-icu4j to a separate com.android.i18n apex. Old one-column format is still supported, but all unqualified components of PRODUCT_BOOT_JARS get "platform:" prepended to them after reading the product makefiles. Test: aosp_walleye-userdebug boots Bug: 138994281 Change-Id: I0f79c7d10477880ca65354251a5d1ca0b7ce79ab
2020-04-30 17:59:48 +08:00
boot_jars := $(foreach pair,$(PRODUCT_BOOT_JARS), $(call word-colon,2,$(pair)))
ifneq ($(filter $(LOCAL_MODULE),$(boot_jars)),) # is_boot_jar
Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk Simplify importing Soong modules into Make by always copying LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets Soong pick the final output file instead of trying to figure out which of the various intermediate files should be the output file. Also fixes an issue where hostdex modules could attempt to copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE), which are the same file for host java modules. Test: set compile_dex:true on core.platform.api.stubs. no warnings of target overriding Test: m checkbuild Change-Id: I2e089012436fe8649db82a673d446d1c5a73a731
2019-01-15 06:10:20 +08:00
ifeq (true,$(WITH_DEXPREOPT))
# For libart, the boot jars' odex files are replaced by $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE).
# We use this installed_odex trick to get boot.art installed.
installed_odex := $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)
# Append the odex for the 2nd arch if we have one.
installed_odex += $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)
ALL_MODULES.$(my_register_name).INSTALLED += $(installed_odex)
# Make sure to install the .odex and .vdex when you run "make <module_name>"
$(my_all_targets): $(installed_odex)
Add a dependency on boot jars $(LOCAL_BUILT_MODULE) After I25163e91886cea6941afa25cdb529ed053278dcb there is no longer a dependency on $(LOCAL_BUILT_MODULE) for boot jars, as boot.art is installed instead. Add a dependency from boot.art to $(LOCAL_BUILT_MODULE) so that $(LOCAL_BUILT_MODULE) and its dependencies (which may include jacoco-report-classes.jar) is copied for every build. Fixes: 127702563 Test: forrest Change-Id: I4db2d1f5fe2e1141fe93317cd7a2a58a33f8fbff
2019-03-19 04:17:22 +08:00
# Copy $(LOCAL_BUILT_MODULE) and its dependencies when installing boot.art
$(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE): $(LOCAL_BUILT_MODULE)
Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk Simplify importing Soong modules into Make by always copying LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets Soong pick the final output file instead of trying to figure out which of the various intermediate files should be the output file. Also fixes an issue where hostdex modules could attempt to copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE), which are the same file for host java modules. Test: set compile_dex:true on core.platform.api.stubs. no warnings of target overriding Test: m checkbuild Change-Id: I2e089012436fe8649db82a673d446d1c5a73a731
2019-01-15 06:10:20 +08:00
endif
endif # is_boot_jar
Move hiddenapi to Soong Perform hiddenapi CSV generation and dex encoding for Soong modules in Soong. This fixes an issue where dexpreopting was happening on a different jar than was being installed. Bug: 122856783 Test: m checkbuild Change-Id: I24a235c63ff62fed7e1af9f2fd17e55b0c1598a5
2019-01-17 07:13:48 +08:00
$(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))
Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk Simplify importing Soong modules into Make by always copying LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets Soong pick the final output file instead of trying to figure out which of the various intermediate files should be the output file. Also fixes an issue where hostdex modules could attempt to copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE), which are the same file for host java modules. Test: set compile_dex:true on core.platform.api.stubs. no warnings of target overriding Test: m checkbuild Change-Id: I2e089012436fe8649db82a673d446d1c5a73a731
2019-01-15 06:10:20 +08:00
$(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(common_javalib.jar)))
Don't depend on classes-header.jar when turbine is disabled TARGET_BUILD_APPS sets TURBINE_ENABLED := false, which triggers an issue where a dependency is added on classes-header.jar but there is no rule to create it. Skip creating the dependency when TURBINE_ENABLED is false for now. Bug: 123183568 Test: m TARGET_PRODUCT=mainline_modules_arm UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true TARGET_BUILD_APPS=com.android.media Change-Id: I8ec3e244b8f9618c58f4ac57329a5a07f01dc797
2019-01-22 02:59:42 +08:00
$(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar)))
ifneq ($(TURBINE_ENABLED),false)
$(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_header_jar)))
endif
Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk Simplify importing Soong modules into Make by always copying LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets Soong pick the final output file instead of trying to figure out which of the various intermediate files should be the output file. Also fixes an issue where hostdex modules could attempt to copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE), which are the same file for host java modules. Test: set compile_dex:true on core.platform.api.stubs. no warnings of target overriding Test: m checkbuild Change-Id: I2e089012436fe8649db82a673d446d1c5a73a731
2019-01-15 06:10:20 +08:00
endif
Allow UnsupportedAppUsage annotations to be in separate target Previously, all the UnsupportedAppUsage annotations were assumed to be in the same target as was used at runtime. e.g. frameworks, core-libart, etc. This change allows separate targets to be specified in the EXTRA_HIDDENAPI_JARS. It is needed to avoid maintaining local patches for those annotations in the libcore/ojluni/src/main/java code which comes from upstream OpenJDK. This was tested by making and then manually checking that the generated out/target/common/obj/PACKAGING/hiddenapi-light-greylist.txt was the same (after sorting) before and after this change. Test: see above Bug: 117818301 Change-Id: Icfadbe52601371f6a4cabef106750b16f6c6d4c8
2018-10-22 20:08:34 +08:00
Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk Simplify importing Soong modules into Make by always copying LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets Soong pick the final output file instead of trying to figure out which of the various intermediate files should be the output file. Also fixes an issue where hostdex modules could attempt to copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE), which are the same file for host java modules. Test: set compile_dex:true on core.platform.api.stubs. no warnings of target overriding Test: m checkbuild Change-Id: I2e089012436fe8649db82a673d446d1c5a73a731
2019-01-15 06:10:20 +08:00
java-dex : $(LOCAL_BUILT_MODULE)
Make classes.jar the output of uninstallable Soong Java modules The soong_java_prebuilt.mk file used to assume that if a Soong module defines a dex jar, it is the output of the module and the module is installable. This may now not be true if the module uses 'compile_dex' to define a secondary build rule for a dex jar. If the module is not installable (LOCAL_UNINSTALLABLE_MODULE=true), do not attempt to preopt and copy classes.jar to the modules output destination. Bug: 79409988 Test: on related CL Change-Id: Ica958ac793e09a0e52125448b44e7cd36e7f35d5
2018-07-03 22:59:48 +08:00
else # LOCAL_SOONG_DEX_JAR
Error if a Soong module attempts to install a classes jar Only dex jars should be installed, make it an error to not provide a dex jar for an device installable java module. Bug: 122831369 Test: m checkbuild Change-Id: I99c5738e6053fbaa3dd22406f50b7a002555702c
2019-01-15 04:49:24 +08:00
ifndef LOCAL_UNINSTALLABLE_MODULE
ifndef LOCAL_IS_HOST_MODULE
$(call pretty-error,Installable device module must have LOCAL_SOONG_DEX_JAR set)
endif
endif
Make classes.jar the output of uninstallable Soong Java modules The soong_java_prebuilt.mk file used to assume that if a Soong module defines a dex jar, it is the output of the module and the module is installable. This may now not be true if the module uses 'compile_dex' to define a secondary build rule for a dex jar. If the module is not installable (LOCAL_UNINSTALLABLE_MODULE=true), do not attempt to preopt and copy classes.jar to the modules output destination. Bug: 79409988 Test: on related CL Change-Id: Ica958ac793e09a0e52125448b44e7cd36e7f35d5
2018-07-03 22:59:48 +08:00
endif # LOCAL_SOONG_DEX_JAR
Make soong_java_prebuilt.mk accept dex jars Accept LOCAL_SOONG_DEX_JAR and copy it to javalib.jar. Test: m -j checkbuild Change-Id: I28f9e99fe19110cab188a9129b058db532aa273f
2017-09-13 04:41:20 +08:00
Move dexpreopting to Soong Move the dexpreopting logic into Soong. Make modules will be dexpreopted by executing the Soong logic in the standalone dexpreopt_gen binary, which will generate scripts that will perform dexpreopting for each module. Export global configuration as JSON to $OUT/dexpreopt.config, which will be used by dexpreopt_gen and Soong, and per-module JSON configuration that will be used by dexpreopt_gen. This relands I59b20c931ee3e5a8d35eb30da4148691c5095502, I39d580999947ee54cfefe875b57a028be5333bd7, Ie7daa94e107d53eff075ca58dbe721bd9d7fc8c2 and Ica006a007d112c232311435aaac0c0e476232b67, with a minor update to match the changes made to dexpreopt_gen arguments and a fix to correctly keep dexpreopt disabled on mac builds. Bug: 119412419 Bug: 120273280 Test: no differences to dexpreopt outputs on aosp_sailfish system/, only expected changes to dexpreopt outputs on system_other (.vdex files for privileged Soong modules no longer incorrectly contain .dex contents). Change-Id: I25163e91886cea6941afa25cdb529ed053278dcb
2018-11-17 13:26:33 +08:00
my_built_installed := $(foreach f,$(LOCAL_SOONG_BUILT_INSTALLED),\
$(call word-colon,1,$(f)):$(PRODUCT_OUT)$(call word-colon,2,$(f)))
my_installed := $(call copy-many-files, $(my_built_installed))
ALL_MODULES.$(my_register_name).INSTALLED += $(my_installed)
ALL_MODULES.$(my_register_name).BUILT_INSTALLED += $(my_built_installed)
AIDEGen: Collect the classes.jar of the prebuilt modules into module-info.json Current information is not enough if the prebuilt modules are depend on AAR libs Therefore, AIDEGen has to collect the classes.jar of the prebuilt modules from build system. Build module-info.json without this change: Build time: 1m55.001s File size: 14,918,354 Bytes Build module-info.json with this change: Build time: 1m56.292s File size: 15,577,031 Bytes Bug: 132768299 Test: 1. Checkout the internal master branch 2. Patch this CL 3. m -j out/target/product/generic_x86_64/module-info.json 4. Open the module-info.json 5. For verifying soong_java_prebuilt.mk, check the classes.jar of module prebuilt-google-play-* exists. e.g. "prebuilt-google-play-...": { ... "classes_jar": [ "out/target/common/obj/JAVA_LIBRARIES/ prebuilt-google-..._intermediates/classes.jar" ] } 5. For verifying java_prebuilt_internal.mk, check the classes.jar of module ink exists. e.g. "ink": { ... "classes_jar": [ "out/target/common/obj/JAVA_LIBRARIES/ink_intermediates/ classes.jar" ] } Change-Id: I09518c92260db47d2686493fa13951f316159d13
2019-05-27 18:48:21 +08:00
ALL_MODULES.$(my_register_name).CLASSES_JAR := $(full_classes_jar)
Move dexpreopting to Soong Move the dexpreopting logic into Soong. Make modules will be dexpreopted by executing the Soong logic in the standalone dexpreopt_gen binary, which will generate scripts that will perform dexpreopting for each module. Export global configuration as JSON to $OUT/dexpreopt.config, which will be used by dexpreopt_gen and Soong, and per-module JSON configuration that will be used by dexpreopt_gen. This relands I59b20c931ee3e5a8d35eb30da4148691c5095502, I39d580999947ee54cfefe875b57a028be5333bd7, Ie7daa94e107d53eff075ca58dbe721bd9d7fc8c2 and Ica006a007d112c232311435aaac0c0e476232b67, with a minor update to match the changes made to dexpreopt_gen arguments and a fix to correctly keep dexpreopt disabled on mac builds. Bug: 119412419 Bug: 120273280 Test: no differences to dexpreopt outputs on aosp_sailfish system/, only expected changes to dexpreopt outputs on system_other (.vdex files for privileged Soong modules no longer incorrectly contain .dex contents). Change-Id: I25163e91886cea6941afa25cdb529ed053278dcb
2018-11-17 13:26:33 +08:00
$(my_register_name): $(my_installed)
Store AAR path from Soong for dist Store the path to the AAR file from Soong so that it will be picked up by dist if requested in TARGET_BUILD_APPS. Test: m checkbuild Change-Id: Ifeaf2b5ca3f405fbe79a966ceee9989a38d77f6e
2018-10-30 14:17:02 +08:00
ifdef LOCAL_SOONG_AAR
Access ALL_MODULES subvars with my_register_name ALL_MODULES and subvars are registered with my_register_name. Replace references of ALL_MODULES.$(LOCAL_MODULE).* with ALL_MODULES.$(my_register_name).*. Bug: 155869107 Test: TH presubmit build pass Test: TH presubmit build noop Change-Id: I1481c341a285dc04de86619abec3194bb92c9739
2020-05-08 15:38:46 +08:00
ALL_MODULES.$(my_register_name).AAR := $(LOCAL_SOONG_AAR)
Store AAR path from Soong for dist Store the path to the AAR file from Soong so that it will be picked up by dist if requested in TARGET_BUILD_APPS. Test: m checkbuild Change-Id: Ifeaf2b5ca3f405fbe79a966ceee9989a38d77f6e
2018-10-30 14:17:02 +08:00
endif
Use soong_java_prebuilt.mk to export soong jars to java Instead of trying to squeeze soong jars through prebuilt_internal.mk, make a separate soong_java_prebuilt.mk. Test: m -j checkbuild Change-Id: I078e67ce58b2b2e0acf4b1ec28823e96b16a0cec
2017-09-08 04:21:51 +08:00
javac-check : $(full_classes_jar)
javac-check-$(LOCAL_MODULE) : $(full_classes_jar)
Mark more targets as PHONY So that we can start restricting non-phony targets to $OUT_DIR and $DIST_DIR. Test: add --writable=out/, see fewer warnings Change-Id: I411fe4af732b1bce35d4a4c1e2a47b5f8a15e6b8
2018-07-24 16:21:12 +08:00
.PHONY: javac-check-$(LOCAL_MODULE)
Use soong_java_prebuilt.mk to export soong jars to java Instead of trying to squeeze soong jars through prebuilt_internal.mk, make a separate soong_java_prebuilt.mk. Test: m -j checkbuild Change-Id: I078e67ce58b2b2e0acf4b1ec28823e96b16a0cec
2017-09-08 04:21:51 +08:00
Make soong_java_prebuilt.mk accept dex jars Accept LOCAL_SOONG_DEX_JAR and copy it to javalib.jar. Test: m -j checkbuild Change-Id: I28f9e99fe19110cab188a9129b058db532aa273f
2017-09-13 04:41:20 +08:00
ifndef LOCAL_IS_HOST_MODULE
ifeq ($(LOCAL_SDK_VERSION),system_current)
my_link_type := java:system
Add LOCAL_SDK_VERSION := system_$(VER) The system_$(VER) can be set in LOCAL_SDK_VERSION, and the apk will use android_system.jar at build time. If LOCAL_SDK_VERSION is not defined and this module is installed in vendor.img, LOCAL_SDK_VERSION is set to system_current. Bug: 67724799 Test: 1. build && run on taimen 2. LOCAL_SDK_VERSION:=system_27 in ims.apk && build ims.apk && check the vsdk_v27_intermediates. Merged-In: I5b11c78b8fcd4a2f2a5e3b141527cd34dbe80018 Change-Id: I5b11c78b8fcd4a2f2a5e3b141527cd34dbe80018 (cherry picked from commit ef212cbe8d6e628bfc40e2db75522b4f1d794766)
2017-10-16 18:20:34 +08:00
else ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION)))
my_link_type := java:system
Support LOCAL_SDK_VERSION := core_current core_current is a pseudo SDK version which is a core Java API subset of the Android API. It is expected to be mainly used for external Java projects which are agnostic to Android; such as junit, guava, etc. A module built with this SDK version can only link to java modules of the same kind. It can't depend on modules built with LOCAL_SDK_VERSION := current or without LOCAL_SDK_VERSION. Bug: 72206056 Test: m -j Change-Id: I34a9696393aa6704fd6684a40ea5b05d3fb46b23
2018-01-30 23:14:55 +08:00
else ifeq ($(LOCAL_SDK_VERSION),core_current)
my_link_type := java:core
Make soong_java_prebuilt.mk accept dex jars Accept LOCAL_SOONG_DEX_JAR and copy it to javalib.jar. Test: m -j checkbuild Change-Id: I28f9e99fe19110cab188a9129b058db532aa273f
2017-09-13 04:41:20 +08:00
else ifneq ($(LOCAL_SDK_VERSION),)
my_link_type := java:sdk
else
my_link_type := java:platform
endif
Remove unnecessary link-type check Modules from Soong do not have dependency specified (via LOCAL_JAVA_LIBRARIES). So, link-type check 'from' them doesn't make sense. Resetting my_warn_types and my_allowed_types Bug: 69899800 Test: m -j checkbuild on aosp_walleye, aosp_sailfish Test: build/soong/build_test.bash --dist Change-Id: I2a409e64f388bd8cb9336be589bf6af33e48a6f4
2018-03-08 14:16:12 +08:00
# warn/allowed types are both empty because Soong modules can't depend on
# make-defined modules.
my_warn_types :=
my_allowed_types :=
Make soong_java_prebuilt.mk accept dex jars Accept LOCAL_SOONG_DEX_JAR and copy it to javalib.jar. Test: m -j checkbuild Change-Id: I28f9e99fe19110cab188a9129b058db532aa273f
2017-09-13 04:41:20 +08:00
my_link_deps :=
my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX)
my_common := COMMON
include $(BUILD_SYSTEM)/link_type.mk
endif # !LOCAL_IS_HOST_MODULE
Export SDK library names A java module exports SDK library names that it is using directly or indirectly via its dependencies. Manifest fixer uses the SDK lib names to automatically add <uses-library> tags for the apk. The SDK library names are exported via exported-sdk-libs file in make. From Soong, they are exported via LOCAL_EXPORT_SDK_LIBRARIES flag. Bug: 77575606 Test: m -j Change-Id: I4e7a9bdc5bf845af85168abf55f8063900bacc72
2018-05-22 14:39:59 +08:00
# LOCAL_EXPORT_SDK_LIBRARIES set by soong is written to exported-sdk-libs file
my_exported_sdk_libs_file := $(intermediates.COMMON)/exported-sdk-libs
$(my_exported_sdk_libs_file): PRIVATE_EXPORTED_SDK_LIBS := $(LOCAL_EXPORT_SDK_LIBRARIES)
$(my_exported_sdk_libs_file):
@echo "Export SDK libs $@"
$(hide) mkdir -p $(dir $@) && rm -f $@
$(if $(PRIVATE_EXPORTED_SDK_LIBS),\
$(hide) echo $(PRIVATE_EXPORTED_SDK_LIBS) | tr ' ' '\n' > $@,\
$(hide) touch $@)
Fix java soong_to_convert data soong_to_convert looks for modules with no unconverted deps, but the list of converted modules was not being updated for java and app prebuilts. That meant soong_to_convert only reported modules with no deps at all. Test: examine soong_to_convert.txt Change-Id: I136e6fa74153a80df5ecd767642bb2feb2ddb9dc
2018-08-17 13:55:43 +08:00
SOONG_ALREADY_CONV := $(SOONG_ALREADY_CONV) $(LOCAL_MODULE)