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

Merge Android 24Q2 Release (ab/11526283) to aosp-main-future

Browse Source 
Bug: 337098550
Merged-In: I713a528d437e3446d32461add648e3b52b036d7a
Change-Id: I7fdd415a218d1425f7fc37095d02c674ddfae6eb
This commit is contained in:
Xin Li
2024-05-24 08:30:06 -07:00
parent 30d7c0b8af 7b0d9878f0
commit b04e9cc36f
20 changed files with 236 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/tasks/tools/compatibility.mk
View File

@@ -26,7 +26,15 @@
# Output variables:
# compatibility_zip: the path to the output zip file.
test_suite_subdir := android-$(test_suite_name)
special_mts_test_suites :=
special_mts_test_suites += mcts
special_mts_test_suites += $(mts_modules)
ifneq ($(filter $(special_mts_test_suites),$(subst -, ,$(test_suite_name))),)
test_suite_subdir := android-mts
else
test_suite_subdir := android-$(test_suite_name)
endif
out_dir := $(HOST_OUT)/$(test_suite_name)/$(test_suite_subdir)
test_artifacts := $(COMPATIBILITY.$(test_suite_name).FILES)
test_tools := $(HOST_OUT_JAVA_LIBRARIES)/tradefed.jar \
@@ -107,9 +115,9 @@ test_suite_notice_html := $(out_dir)/NOTICE.html
compatibility_zip_deps += $(test_suite_notice_txt)
compatibility_zip_resources += $(test_suite_notice_txt)
compatibility_tests_list_zip := $(out_dir)-tests_list.zip
compatibility_tests_list_zip := $(HOST_OUT)/$(test_suite_name)/android-$(test_suite_name)-tests_list.zip
compatibility_zip := $(out_dir).zip
compatibility_zip := $(HOST_OUT)/$(test_suite_name)/android-$(test_suite_name).zip
$(compatibility_zip) : .KATI_IMPLICIT_OUTPUTS := $(compatibility_tests_list_zip)
$(compatibility_zip): PRIVATE_OUT_DIR := $(out_dir)
$(compatibility_zip): PRIVATE_TOOLS := $(test_tools) $(test_suite_prebuilt_tools)