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

Commit d8f89107 authored by Bob Badour's avatar Bob Badour Committed by Gerrit Code Review
Browse files

Merge "Test suite notices using dependencies."

parents 3c51ee31 42f00c7b

core/base_rules.mk

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ ifeq ($(LOCAL_MODULE),) 
endif

$(call verify-module-name)



my_test_data :=

my_test_config :=



LOCAL_IS_HOST_MODULE := $(strip $(LOCAL_IS_HOST_MODULE))

ifdef LOCAL_IS_HOST_MODULE

  ifneq ($(LOCAL_IS_HOST_MODULE),true)

core/clear_vars.mk

+2 −0
Original line number Diff line number Diff line
@@ -510,6 +510,8 @@ LOCAL_TEST_PACKAGE := 
full_android_manifest :=

non_system_module :=



module_license_metadata :=



# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# iterate over thousands of entries every time.

# Leave the current makefile to make sure we don't break anything

core/definitions.mk

+13 −5
Original line number Diff line number Diff line
@@ -674,12 +674,12 @@ $(strip $(eval _deps := $(sort $(filter-out 0p: :,$(foreach d,$(strip $(ALL_NON_ 
$(strip $(eval _notices := $(sort $(ALL_NON_MODULES.$(_tgt).NOTICES))))

$(strip $(eval _path := $(sort $(ALL_NON_MODULES.$(_tgt).PATH))))

$(strip $(eval _install_map := $(ALL_NON_MODULES.$(_tgt).ROOT_MAPPINGS)))

$(strip \

  $(foreach d,$(strip $(ALL_NON_MODULES.$(_tgt).DEPENDENCIES)), \

    $(if $(strip $(ALL_TARGETS.$(d).META_LIC)), \

$(strip $(eval \

  $$(foreach d,$(strip $(ALL_NON_MODULES.$(_tgt).DEPENDENCIES)), \

    $$(if $$(strip $$(ALL_TARGETS.$$(d).META_LIC)), \

      , \

      $(eval NON_MODULES_WITHOUT_LICENSE_METADATA += $(d))) \

  ) \

      $$(eval NON_MODULES_WITHOUT_LICENSE_METADATA += $$(d))) \

  )) \

)



$(_dir)/$(_tgt).meta_lic: PRIVATE_KINDS := $(sort $(ALL_NON_MODULES.$(_tgt).LICENSE_KINDS))
@@ -3315,6 +3315,14 @@ endef 
#    and use my_compat_dist_$(suite) to define the others.

define create-suite-dependencies

$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

  $(eval $(if $(strip $(module_license_metadata)),\

    $$(foreach f,$$(my_compat_dist_$(suite)),$$(eval ALL_TARGETS.$$(call word-colon,2,$$(f)).META_LIC := $(module_license_metadata))),\

    $$(eval my_test_data += $$(foreach f,$$(my_compat_dist_$(suite)), $$(call word-colon,2,$$(f)))) \

  )) \

  $(eval $(if $(strip $(module_license_metadata)),\

    $$(foreach f,$$(my_compat_dist_config_$(suite)),$$(eval ALL_TARGETS.$$(call word-colon,2,$$(f)).META_LIC := $(module_license_metadata))),\

    $$(eval my_test_config += $$(foreach f,$$(my_compat_dist_config_$(suite)), $$(call word-colon,2,$$(f)))) \

  )) \

  $(if $(filter $(suite),$(ALL_COMPATIBILITY_SUITES)),,\

    $(eval ALL_COMPATIBILITY_SUITES += $(suite)) \

    $(eval COMPATIBILITY.$(suite).FILES :=) \

core/notice_files.mk

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ module_license_metadata := 
ifdef my_register_name

  module_license_metadata := $(call local-intermediates-dir)/$(my_register_name).meta_lic



  $(foreach target,$(ALL_MODULES.$(my_register_name).BUILT) $(ALL_MODULES.$(my_register_name).INSTALLED),\

  $(foreach target,$(ALL_MODULES.$(my_register_name).BUILT) $(ALL_MODULES.$(my_register_name).INSTALLED) $(my_test_data) $(my_test_config),\

    $(eval ALL_TARGETS.$(target).META_LIC := $(module_license_metadata)))



  ALL_MODULES.$(my_register_name).META_LIC := $(strip $(ALL_MODULES.$(my_register_name).META_LIC) $(module_license_metadata))

core/tasks/cts.mk

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ test_suite_tradefed := cts-tradefed 
test_suite_dynamic_config := cts/tools/cts-tradefed/DynamicConfig.xml

test_suite_readme := cts/tools/cts-tradefed/README



$(call declare-1p-target,$(test_suite_dynamic_config),cts)

$(call declare-1p-target,$(test_suite_readme),cts)



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



.PHONY: cts