commit afacee13a1115a085f913c99db41e2f05f3d7e77
author Treehugger Robot <treehugger-gerrit@google.com> Sat Mar 23 01:54:09 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 23 01:54:09 2019 +0000
tree b891df47bd2d63c24c78477653b016c249655250
parent e1de4940a776e42a98a6a812f97cff36266fbfab
parent dc30e1e9b20f72b482536fb015923522cfec346e

Merge "Fix vts packaging when moving installed path to testcase for all tests."

tools/build/utils/vts_package_utils.mk

diff --git a/tools/build/utils/vts_package_utils.mk b/tools/build/utils/vts_package_utils.mk
index f103452..135d8c1 100644
--- a/tools/build/utils/vts_package_utils.mk
+++ b/tools/build/utils/vts_package_utils.mk
@@ -20,15 +20,23 @@
 define target-native-copy-pairs
 $(foreach m,$(1),\
   $(eval _built_files := $(strip $(ALL_MODULES.$(m).BUILT_INSTALLED)\
-  $(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).BUILT_INSTALLED)))\
+    $(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).BUILT_INSTALLED)))\
+  $(eval _module_class_folder := $($(strip MODULE_CLASS_$(word 1, $(strip $(ALL_MODULES.$(m).CLASS)\
+    $(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).CLASS))))))\
   $(foreach i, $(_built_files),\
     $(eval bui_ins := $(subst :,$(space),$(i)))\
     $(eval ins := $(word 2,$(bui_ins)))\
     $(if $(filter $(TARGET_OUT_ROOT)/%,$(ins)),\
       $(eval bui := $(word 1,$(bui_ins)))\
+      $(if $(filter $(_module_class_folder), nativetest benchmarktest),\
+        $(eval module_class_folder_stem := $(_module_class_folder)$(findstring 64, $(patsubst $(PRODUCT_OUT)/%,%,$(ins)))),\
+        $(eval module_class_folder_stem := $(_module_class_folder)))\
       $(eval my_copy_dest := $(patsubst data/%,DATA/%,\
-                               $(patsubst system/%,DATA/%,\
-                                   $(patsubst $(PRODUCT_OUT)/%,%,$(ins)))))\
+                               $(patsubst testcases/%,DATA/$(module_class_folder_stem)/%,\
+                                 $(patsubst testcases/$(m)/$(TARGET_ARCH)/%,DATA/$(module_class_folder_stem)/$(m)/%,\
+                                   $(patsubst testcases/$(m)/$(TARGET_2ND_ARCH)/%,DATA/$(module_class_folder_stem)/$(m)/%,\
+                                     $(patsubst system/%,DATA/%,\
+                                       $(patsubst $(PRODUCT_OUT)/%,%,$(ins))))))))\
       $(bui):$(2)/$(my_copy_dest))))
 endef