Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d88026e authored by Yihan Dong's avatar Yihan Dong Committed by Gerrit Code Review
Browse files

Merge "Add additional license dependencies for VTS"

parents 475b885a e45ff687

core/tasks/tools/compatibility.mk

+3 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ compatibility_zip_deps := \ 
  $(MERGE_ZIPS) \

  $(SOONG_ZIP) \

  $(host_shared_libs) \

  $(test_suite_extra_deps) \



compatibility_zip_resources := $(out_dir)/tools $(out_dir)/testcases $(out_dir)/lib $(out_dir)/lib64
@@ -139,3 +140,4 @@ test_suite_tools := 
test_suite_jdk :=

test_suite_jdk_dir :=

host_shared_libs :=

test_suite_extra_deps :=

core/tasks/tools/vts_package_utils.mk

+1 −0
Original line number Diff line number Diff line
@@ -29,5 +29,6 @@ $(foreach m,$(1),\ 
      $(eval my_copy_dest := $(patsubst data/%,DATA/%,\

                               $(patsubst system/%,DATA/%,\

                                   $(patsubst $(PRODUCT_OUT)/%,%,$(ins)))))\

      $(eval ALL_TARGETS.$(2)/$(my_copy_dest).META_LIC := $(if $(strip $(ALL_MODULES.$(m).META_LIC)),$(ALL_MODULES.$(m).META_LIC),$(ALL_MODULES.$(m).DELAYED_META_LIC)))\

      $(bui):$(2)/$(my_copy_dest))))

endef

core/tasks/vts-core-tests.mk

+2 −2
Original line number Diff line number Diff line
@@ -35,14 +35,14 @@ kernel_test_copy_pairs := \ 


copy_kernel_tests := $(call copy-many-files,$(kernel_test_copy_pairs))



test_suite_extra_deps := $(copy_kernel_tests)



# PHONY target to be used to build and test `vts_kernel_tests` without building full vts

.PHONY: vts_kernel_tests

vts_kernel_tests: $(copy_kernel_tests)



include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk



$(compatibility_zip): $(copy_kernel_tests)



.PHONY: vts

vts: $(compatibility_zip) $(compatibility_tests_list_zip)

$(call dist-for-goals, vts, $(compatibility_zip) $(compatibility_tests_list_zip))