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

Commit 651b8b7e authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Support per-testcase directories in all test suites" am: 894e9be3

Original change: https://android-review.googlesource.com/c/platform/build/+/1838354

Change-Id: I27999b873212cb1ab52cb75a7dd9a6992d595145
parents e6a4320c 894e9be3
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ LOCAL_CLANG_CPPFLAGS:=
LOCAL_CLANG_LDFLAGS:=
LOCAL_CLASSPATH:=
LOCAL_COMPATIBILITY_SUITE:=
LOCAL_COMPATIBILITY_PER_TESTCASE_DIRECTORY:=
LOCAL_COMPATIBILITY_SUPPORT_FILES:=
LOCAL_COMPRESSED_MODULE:=
LOCAL_CONLYFLAGS:=
+4 −3
Original line number Diff line number Diff line
@@ -2994,9 +2994,10 @@ endef
# Can be passed a subdirectory to use for the common testcase directory.
define compatibility_suite_dirs
  $(strip \
    $(if $(COMPATIBILITY_TESTCASES_OUT_INCLUDE_MODULE_FOLDER_$(1)),\
    $(if $(COMPATIBILITY_TESTCASES_OUT_$(1)), \
      $(if $(COMPATIBILITY_TESTCASES_OUT_INCLUDE_MODULE_FOLDER_$(1))$(LOCAL_COMPATIBILITY_PER_TESTCASE_DIRECTORY),\
        $(COMPATIBILITY_TESTCASES_OUT_$(1))/$(LOCAL_MODULE)$(2),\
      $(COMPATIBILITY_TESTCASES_OUT_$(1))) \
        $(COMPATIBILITY_TESTCASES_OUT_$(1)))) \
    $($(my_prefix)OUT_TESTCASES)/$(LOCAL_MODULE)$(2))
endef