Merge "Revert "Revert "add target-side script dir/file and package them as part of vts"""
diff --git a/script/target/vts_adapter.sh b/script/target/vts_adapter.sh
new file mode 100755
index 0000000..d22240d
--- /dev/null
+++ b/script/target/vts_adapter.sh
@@ -0,0 +1,4 @@
+#!/system/bin/sh
+echo "start $1 -p $2 $3 $4"
+nohup $1 -p $2 $3 $4 &>/dev/null &
+echo "done"
diff --git a/tools/build/tasks/vts_package.mk b/tools/build/tasks/vts_package.mk
index f75d412..0433c95 100644
--- a/tools/build/tasks/vts_package.mk
+++ b/tools/build/tasks/vts_package.mk
@@ -226,6 +226,13 @@
   $(foreach f,$(acts_testcases_files),\
     tools/test/connectivity/acts/tests/google/$(f):$(VTS_TESTCASES_OUT)/vts/testcases/acts/$(f))
 
+target_script_files := \
+  $(call find-files-in-subdirs,test/vts/script/target,"*.sh" -and -type f,.)
+
+target_script_copy_pairs := \
+  $(foreach f,$(target_script_files),\
+    test/vts/script/target/$(f):$(VTS_TESTCASES_OUT)/script/target/$(f))
+
 $(compatibility_zip): vts_copy_pairs
 
 vts_copy_pairs: \
@@ -248,7 +255,8 @@
   $(call copy-many-files,$(audio_test_res_copy_pairs)) \
   $(call copy-many-files,$(kernel_rootdir_test_rc_copy_pairs)) \
   $(call copy-many-files,$(acts_framework_copy_pairs)) \
-  $(call copy-many-files,$(acts_testcases_copy_pairs))
+  $(call copy-many-files,$(acts_testcases_copy_pairs)) \
+  $(call copy-many-files,$(target_script_copy_pairs))
 	@touch $(VTS_TESTCASES_OUT)/vti/test_serving/__init__.py
 	@touch $(VTS_TESTCASES_OUT)/vti/__init__.py