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

Commit 054f210f authored by Nelson Li's avatar Nelson Li Committed by Simran Basi
Browse files

Revert "Build System: Validate AndroidTest.xml Configs" 

This reverts commit 479da2f3.

Reason for revert: <revert for b/109736180 #8>

Bug: 109736180
Test: lunch walleye_coverage-userdebug; make adbd_test
Change-Id: I090893e20a2dab0651551361ebf65c26b95a25f2
parent 479da2f3

core/base_rules.mk

+4 −7
Original line number Diff line number Diff line
@@ -557,8 +557,7 @@ multi_arch := 
# The module itself.

$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

  $(eval my_compat_dist_$(suite) := $(foreach dir, $(call compatibility_suite_dirs,$(suite),$(arch_dir)), \

    $(LOCAL_BUILT_MODULE):$(dir)/$(my_installed_module_stem))) \

  $(eval my_compat_dist_config_$(suite) := ))

    $(LOCAL_BUILT_MODULE):$(dir)/$(my_installed_module_stem))))



# Make sure we only add the files once for multilib modules.

ifndef $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files
@@ -605,7 +604,7 @@ is_instrumentation_test := 


ifneq (,$(test_config))

$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

  $(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \

  $(eval my_compat_dist_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \

    $(test_config):$(dir)/$(LOCAL_MODULE).config)))

endif
@@ -613,14 +612,14 @@ test_config := 


ifneq (,$(wildcard $(LOCAL_PATH)/DynamicConfig.xml))

$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

  $(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \

  $(eval my_compat_dist_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \

    $(LOCAL_PATH)/DynamicConfig.xml:$(dir)/$(LOCAL_MODULE).dynamic)))

endif



ifneq (,$(wildcard $(LOCAL_PATH)/$(LOCAL_MODULE)_*.config))

$(foreach extra_config, $(wildcard $(LOCAL_PATH)/$(LOCAL_MODULE)_*.config), \

  $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

    $(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \

    $(eval my_compat_dist_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \

      $(extra_config):$(dir)/$(notdir $(extra_config))))))

endif

endif # $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files
@@ -639,8 +638,6 @@ arch_dir := 
is_native :=



$(call create-suite-dependencies)

$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

  $(eval my_compat_dist_config_$(suite) := ))



endif  # LOCAL_COMPATIBILITY_SUITE

core/definitions.mk

+3 −20
Original line number Diff line number Diff line
@@ -2671,18 +2671,6 @@ $(2): $(1) $(XMLLINT) 
	$$(copy-file-to-target)

endef



# Copies many xml files and check they are well-formed.

# $(1): The xml files to copy.  Each entry is a ':' separated src:dst pair.

# Evaluates to the list of the dst files. (ie suitable for a dependency list.)

define copy-many-xml-files-checked

$(foreach f, $(1), $(strip \

    $(eval _cmf_tuple := $(subst :, ,$(f))) \

    $(eval _cmf_src := $(word 1,$(_cmf_tuple))) \

    $(eval _cmf_dest := $(word 2,$(_cmf_tuple))) \

    $(eval $(call copy-xml-file-checked,$(_cmf_src),$(_cmf_dest))) \

    $(_cmf_dest)))

endef



# Copy the file only if it is a well-formed manifest file. For use viea $(eval)

# $(1): source file

# $(2): destination file
@@ -3128,20 +3116,15 @@ endef 


# For each suite:

# 1. Copy the files to the many suite output directories.

#    And for test config files, we'll check the .xml is well-formed before copy.

# 2. Add all the files to each suite's dependent files list.

# 3. Do the dependency addition to my_all_targets

# Requires for each suite: use my_compat_dist_config_$(suite) to define the test config.

#    and use my_compat_dist_$(suite) to define the others.

# Requires for each suite: my_compat_dist_$(suite) to be defined.

define create-suite-dependencies

$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

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

    $$(COMPATIBILITY.$(suite).FILES) $$(foreach f,$$(my_compat_dist_$(suite)),$$(call word-colon,2,$$(f))) \

      $$(foreach f,$$(my_compat_dist_config_$(suite)),$$(call word-colon,2,$$(f))))) \

    $$(COMPATIBILITY.$(suite).FILES) $$(foreach f,$$(my_compat_dist_$(suite)),$$(call word-colon,2,$$(f))))) \

$(eval $(my_all_targets) : $(call copy-many-files, \

  $(sort $(foreach suite,$(LOCAL_COMPATIBILITY_SUITE),$(my_compat_dist_$(suite))))) \

  $(call copy-many-xml-files-checked, \

    $(sort $(foreach suite,$(LOCAL_COMPATIBILITY_SUITE),$(my_compat_dist_config_$(suite))))))

  $(sort $(foreach suite,$(LOCAL_COMPATIBILITY_SUITE),$(my_compat_dist_$(suite))))))

endef



###########################################################