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

Commit 9079b1b4 authored by nelsonli's avatar nelsonli Committed by android-build-merger
Browse files

Merge "Build: Fix test data no present in test suite zip files." am: 98b9c5dd am: 4cb85b58 

am: b15f35c0

Change-Id: I16bd42ed419b5865831daa646dc35e5eb3e3dc34
parents d44df7d9 b15f35c0

core/base_rules.mk

+0 −13
Original line number Diff line number Diff line
@@ -710,18 +710,6 @@ ifneq (,$(filter $(SOONG_OUT_DIR)%,$(LOCAL_FULL_TEST_CONFIG))) 
  endif

endif





ifeq ($(use_testcase_folder),true)

ifneq ($(my_test_data_file_pairs),)

$(foreach pair, $(my_test_data_file_pairs), \

  $(eval parts := $(subst :,$(space),$(pair))) \

  $(eval src_path := $(word 1,$(parts))) \

  $(eval file := $(word 2,$(parts))) \

  $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

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

      $(call filter-copy-pair,$(src_path),$(call append-path,$(dir),$(file)),$(my_installed_test_data))))))

endif

else

ifneq ($(my_test_data_file_pairs),)

$(foreach pair, $(my_test_data_file_pairs), \

  $(eval parts := $(subst :,$(space),$(pair))) \
@@ -731,7 +719,6 @@ $(foreach pair, $(my_test_data_file_pairs), \ 
    $(eval my_compat_dist_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite),$(arch_dir)), \

      $(src_path):$(call append-path,$(dir),$(file))))))

endif

endif

core/definitions.mk

+0 −10
Original line number Diff line number Diff line
@@ -2417,16 +2417,6 @@ define compat-copy-pair 
$(if $(filter-out $(2), $(LOCAL_INSTALLED_MODULE)), $(1):$(2))

endef



# Create copy pair for $(1) $(2)

# If $(2) is substring of $(3) do nothing.

# $(1): source path

# $(2): destination path

# $(3): filter-out target

# The format of copy pair is src:dst

define filter-copy-pair

$(if $(findstring $(2), $(3)),,$(1):$(2))

endef



# Copies many files.

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

# $(2): An optional directory to prepend to the destination