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

Merge "Package host shared lib for art-host-tests"

Browse Source
This commit is contained in:
Dan Shi
2020-10-22 17:39:58 +00:00
committed by Gerrit Code Review
parent 0b0d8d5b53 cb8655c3b9
commit 0b8473591c
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/main.mk
View File

@@ -895,7 +895,7 @@ endef
# Scan all modules in general-tests, device-tests and other selected suites and # Scan all modules in general-tests, device-tests and other selected suites and
# flatten the shared library dependencies. # flatten the shared library dependencies.
define update-host-shared-libs-deps-for-suites define update-host-shared-libs-deps-for-suites
$(foreach suite,general-tests device-tests vts,\ $(foreach suite,general-tests device-tests vts art-host-tests,\
$(foreach m,$(COMPATIBILITY.$(suite).MODULES),\ $(foreach m,$(COMPATIBILITY.$(suite).MODULES),\
$(eval my_deps := $(call get-all-shared-libs-deps,$(m)))\ $(eval my_deps := $(call get-all-shared-libs-deps,$(m)))\
$(foreach dep,$(my_deps),\ $(foreach dep,$(my_deps),\

21
core/tasks/art-host-tests.mk
View File

@@ -16,12 +16,27 @@
intermediates_dir := $(call intermediates-dir-for,PACKAGING,art-host-tests) intermediates_dir := $(call intermediates-dir-for,PACKAGING,art-host-tests)
art_host_tests_zip := $(PRODUCT_OUT)/art-host-tests.zip art_host_tests_zip := $(PRODUCT_OUT)/art-host-tests.zip
$(art_host_tests_zip) : $(COMPATIBILITY.art-host-tests.FILES) $(SOONG_ZIP) # Get the hostside libraries to be packaged in the test zip. Unlike
# device-tests.mk or general-tests.mk, the files are not copied to the
# testcases directory.
my_host_shared_lib_for_art_host_tests := $(foreach f,$(COMPATIBILITY.art-host-tests.HOST_SHARED_LIBRARY.FILES),$(strip \
$(eval _cmf_tuple := $(subst :, ,$(f))) \
$(eval _cmf_src := $(word 1,$(_cmf_tuple))) \
$(_cmf_src)))
$(art_host_tests_zip) : PRIVATE_HOST_SHARED_LIBS := $(my_host_shared_lib_for_art_host_tests)
$(art_host_tests_zip) : $(COMPATIBILITY.art-host-tests.FILES) $(my_host_shared_lib_for_art_host_tests) $(SOONG_ZIP)
echo $(sort $(COMPATIBILITY.art-host-tests.FILES)) | tr " " "\n" > $@.list echo $(sort $(COMPATIBILITY.art-host-tests.FILES)) | tr " " "\n" > $@.list
grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true
$(hide) for shared_lib in $(PRIVATE_HOST_SHARED_LIBS); do \
echo $$shared_lib >> $@-host-libs.list; \
done
grep $(TARGET_OUT_TESTCASES) $@.list > $@-target.list || true grep $(TARGET_OUT_TESTCASES) $@.list > $@-target.list || true
$(hide) $(SOONG_ZIP) -d -o $@ -P host -C $(HOST_OUT) -l $@-host.list -P target -C $(PRODUCT_OUT) -l $@-target.list $(hide) $(SOONG_ZIP) -d -o $@ -P host -C $(HOST_OUT) -l $@-host.list \
rm -f $@.list $@-host.list $@-target.list -P target -C $(PRODUCT_OUT) -l $@-target.list \
-P host/testcases -C $(HOST_OUT) -l $@-host-libs.list
rm -f $@.list $@-host.list $@-target.list $@-host-libs.list
art-host-tests: $(art_host_tests_zip) art-host-tests: $(art_host_tests_zip)
$(call dist-for-goals, art-host-tests, $(art_host_tests_zip)) $(call dist-for-goals, art-host-tests, $(art_host_tests_zip))