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

Commit 64173870 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Exempt Soong from LOCAL_TEST_DATA checks" am: 2683a137 

am: 774b6037

Change-Id: I97dc09ebff1842500093553a4de88f4a167e4c8f
parents 0115f27a 774b6037

core/base_rules.mk

+3 −2
Original line number Diff line number Diff line
@@ -508,8 +508,9 @@ my_test_data_pairs := $(strip $(foreach td,$(LOCAL_TEST_DATA), \ 
      $(eval _src_base := $(call word-colon,1,$(td))), \

      $(eval _src_base := $(LOCAL_PATH)) \

        $(eval _file := $(call word-colon,1,$(td)))) \

    $(if $(call streq,$(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)),, \

      $(if $(findstring ..,$(_file)),$(error $(LOCAL_MODULE_MAKEFILE): LOCAL_TEST_DATA may not include '..': $(_file))) \

    $(if $(filter /%,$(_src_base) $(_file)),$(error $(LOCAL_MODULE_MAKEFILE): LOCAL_TEST_DATA may not include absolute paths: $(_src_base) $(_file))) \

      $(if $(filter /%,$(_src_base) $(_file)),$(error $(LOCAL_MODULE_MAKEFILE): LOCAL_TEST_DATA may not include absolute paths: $(_src_base) $(_file)))) \

    $(eval my_test_data_file_pairs := $(my_test_data_file_pairs) $(call append-path,$(_src_base),$(_file)):$(_file)) \

    $(call append-path,$(_src_base),$(_file)):$(call append-path,$(my_module_path),$(_file))))