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

Merge "Collect xTS jar/apk packages from soong intermediate dirs" into main

Browse Source
This commit is contained in:
Yihan Dong
2024-05-31 08:46:25 +00:00
committed by Gerrit Code Review
parent 7de8a01cc1 f55cd66417
commit 69fe181b1d
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/base_rules.mk
View File

@@ -768,6 +768,10 @@ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(LOCAL_BUILT_MODULE):$(dir)/$(my_installed_module_stem)))) \ $(LOCAL_BUILT_MODULE):$(dir)/$(my_installed_module_stem)))) \
$(eval my_compat_dist_config_$(suite) := )) $(eval my_compat_dist_config_$(suite) := ))
ifneq (,$(LOCAL_SOONG_CLASSES_JAR))
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(eval my_compat_api_map_$(suite) += $(LOCAL_SOONG_CLASSES_JAR)))
endif
# Auto-generate build config. # Auto-generate build config.
ifeq (,$(test_config)) ifeq (,$(test_config))
@@ -821,6 +825,12 @@ else
$(foreach dir, $(call compatibility_suite_dirs,$(suite)), \ $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \
$(s):$(dir)/$(n))))) $(s):$(dir)/$(n)))))
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(eval my_compat_api_map_$(suite) += $(foreach f, $(LOCAL_COMPATIBILITY_SUPPORT_FILES), \
$(eval p := $(subst :,$(space),$(f))) \
$(eval s := $(word 1,$(p))) \
$(if $(filter %.apk,$(s)) $(filter %.jar,$(s)),$(s),))))
ifneq (,$(test_config)) ifneq (,$(test_config))
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \ $(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \
@@ -863,7 +873,9 @@ $(foreach pair, $(my_test_data_file_pairs), \
$(call filter-copy-pair,$(src_path),$(call append-path,$(dir),$(file)),$(my_installed_test_data)))) \ $(call filter-copy-pair,$(src_path),$(call append-path,$(dir),$(file)),$(my_installed_test_data)))) \
$(eval my_compat_dist_test_data_$(suite) += \ $(eval my_compat_dist_test_data_$(suite) += \
$(foreach dir, $(call compatibility_suite_dirs,$(suite),$(arch_dir)), \ $(foreach dir, $(call compatibility_suite_dirs,$(suite),$(arch_dir)), \
$(filter $(my_installed_test_data),$(call append-path,$(dir),$(file))))))) $(filter $(my_installed_test_data),$(call append-path,$(dir),$(file))))) \
$(eval my_compat_api_map_$(suite) += \
$(if $(filter %.apk,$(src_path)) $(filter %.jar,$(src_path)),$(src_path),))))
endif endif
else else
ifneq ($(my_test_data_file_pairs),) ifneq ($(my_test_data_file_pairs),)
@@ -873,7 +885,9 @@ $(foreach pair, $(my_test_data_file_pairs), \
$(eval file := $(word 2,$(parts))) \ $(eval file := $(word 2,$(parts))) \
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(eval my_compat_dist_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite),$(arch_dir)), \ $(eval my_compat_dist_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite),$(arch_dir)), \
$(src_path):$(call append-path,$(dir),$(file)))))) $(src_path):$(call append-path,$(dir),$(file)))) \
$(eval my_compat_api_map_$(suite) += \
$(if $(filter %.apk,$(src_path)) $(filter %.jar,$(src_path)),$(src_path),))))
endif endif
endif endif
@@ -885,7 +899,8 @@ is_native :=
$(call create-suite-dependencies) $(call create-suite-dependencies)
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(eval my_compat_dist_config_$(suite) := ) \ $(eval my_compat_dist_config_$(suite) := ) \
$(eval my_compat_dist_test_data_$(suite) := )) $(eval my_compat_dist_test_data_$(suite) := ) \
$(eval my_compat_api_map_$(suite) := ))
endif # LOCAL_UNINSTALLABLE_MODULE endif # LOCAL_UNINSTALLABLE_MODULE

4
core/definitions.mk
View File

@@ -3589,11 +3589,13 @@ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(if $(filter $(suite),$(ALL_COMPATIBILITY_SUITES)),,\ $(if $(filter $(suite),$(ALL_COMPATIBILITY_SUITES)),,\
$(eval ALL_COMPATIBILITY_SUITES += $(suite)) \ $(eval ALL_COMPATIBILITY_SUITES += $(suite)) \
$(eval COMPATIBILITY.$(suite).FILES :=) \ $(eval COMPATIBILITY.$(suite).FILES :=) \
$(eval COMPATIBILITY.$(suite).MODULES :=)) \ $(eval COMPATIBILITY.$(suite).MODULES :=) \
$(eval COMPATIBILITY.$(suite).API_MAP_FILES :=)) \
$(eval COMPATIBILITY.$(suite).FILES += \ $(eval COMPATIBILITY.$(suite).FILES += \
$$(foreach f,$$(my_compat_dist_$(suite)),$$(call word-colon,2,$$(f))) \ $$(foreach f,$$(my_compat_dist_$(suite)),$$(call word-colon,2,$$(f))) \
$$(foreach f,$$(my_compat_dist_config_$(suite)),$$(call word-colon,2,$$(f))) \ $$(foreach f,$$(my_compat_dist_config_$(suite)),$$(call word-colon,2,$$(f))) \
$$(my_compat_dist_test_data_$(suite))) \ $$(my_compat_dist_test_data_$(suite))) \
$(eval COMPATIBILITY.$(suite).API_MAP_FILES += $$(my_compat_api_map_$(suite))) \
$(eval ALL_COMPATIBILITY_DIST_FILES += $$(my_compat_dist_$(suite))) \ $(eval ALL_COMPATIBILITY_DIST_FILES += $$(my_compat_dist_$(suite))) \
$(eval COMPATIBILITY.$(suite).MODULES += $$(my_register_name))) \ $(eval COMPATIBILITY.$(suite).MODULES += $$(my_register_name))) \
$(eval $(my_all_targets) : \ $(eval $(my_all_targets) : \