diff options
| author | 2020-10-21 14:16:25 -0700 | |
|---|---|---|
| committer | 2020-10-21 21:28:34 -0700 | |
| commit | cb8655c3b96a1617b19035c41241c10e9a36442c (patch) | |
| tree | ec48c0f5d2dbfe06029a0e1fca2b7719403cef0c | |
| parent | 9873891bd0190cbae0943e48cae22a3fd2a55e07 (diff) | |
Package host shared lib for art-host-tests
Bug: 169111770
Test: m art-host-tests
Change-Id: Ic5a9740977cd9a1f6bdfbbfef81116f7a3cf5e8a
| -rw-r--r-- | core/main.mk | 2 | ||||
| -rw-r--r-- | core/tasks/art-host-tests.mk | 21 |
2 files changed, 19 insertions, 4 deletions
diff --git a/core/main.mk b/core/main.mk index 40cc70f7d5..9a8a8718f7 100644 --- a/core/main.mk +++ b/core/main.mk @@ -895,7 +895,7 @@ endef # Scan all modules in general-tests, device-tests and other selected suites and # flatten the shared library dependencies. 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),\ $(eval my_deps := $(call get-all-shared-libs-deps,$(m)))\ $(foreach dep,$(my_deps),\ diff --git a/core/tasks/art-host-tests.mk b/core/tasks/art-host-tests.mk index 96e2c7426f..d771b063e9 100644 --- a/core/tasks/art-host-tests.mk +++ b/core/tasks/art-host-tests.mk @@ -16,12 +16,27 @@ intermediates_dir := $(call intermediates-dir-for,PACKAGING,art-host-tests) 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 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 - $(hide) $(SOONG_ZIP) -d -o $@ -P host -C $(HOST_OUT) -l $@-host.list -P target -C $(PRODUCT_OUT) -l $@-target.list - rm -f $@.list $@-host.list $@-target.list + $(hide) $(SOONG_ZIP) -d -o $@ -P host -C $(HOST_OUT) -l $@-host.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) $(call dist-for-goals, art-host-tests, $(art_host_tests_zip)) |