resolved conflicts for merge of b9e4848e to master

Change-Id: Ia1ea1c3cf7669c2eeaefa1f10c511aa1e782386b

diff --cc core/tasks/cts.mk
index acaaa29,23648f8..668d5bb
--- 1/core/tasks/cts.mk
--- 2/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@@ -88,13 -86,11 +88,16 @@@ $(foreach m, $(CTS_CORE_CASE_LIST),
      $(eval $(call copy-one-file, $(built), $(installed)))\
      $(eval CTS_CASE_LIST_APKS += $(installed))))
  
 +CTS_CASE_LIST_JARS :=
 +$(foreach m, $(CTS_TEST_JAR_LIST),\
 +  $(eval CTS_CASE_LIST_JARS += $(CTS_TESTCASES_OUT)/$(m).jar))
 +
+ CTS_SHARED_LIBS := \
+       $(HOST_LIBRARY_PATH)/libc++$(HOST_SHLIB_SUFFIX)
+ 
  DEFAULT_TEST_PLAN := $(cts_dir)/$(cts_name)/resource/plans
- $(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_JAR_FILES) $(CTS_TEST_CASES) $(CTS_CASE_LIST_APKS) $(CTS_CASE_LIST_JARS) $(JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(VMTESTSTF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ADDITIONAL_TF_JARS) $(ACP)
 -$(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_CASES) $(CTS_CASE_LIST_APKS) $(JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(VMTESTSTF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ACP) $(CTS_TEST_JAR_FILES) $(CTS_SHARED_LIBS)
++$(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_JAR_FILES) $(CTS_TEST_CASES) $(CTS_CASE_LIST_APKS) $(CTS_CASE_LIST_JARS) $(JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(VMTESTSTF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ADDITIONAL_TF_JARS) $(ACP) $(CTS_SHARED_LIBS)
 +
  # Make necessary directory for CTS
        $(hide) mkdir -p $(TMP_DIR)
        $(hide) mkdir -p $(PRIVATE_DIR)/docs
@@@ -102,8 -98,12 +105,9 @@@
        $(hide) mkdir -p $(PRIVATE_DIR)/repository/testcases
        $(hide) mkdir -p $(PRIVATE_DIR)/repository/plans
  # Copy executable and JARs to CTS directory
 -      $(hide) $(ACP) -fp $(VMTESTSTF_JAR) $(PRIVATE_DIR)/repository/testcases
 -      $(hide) $(ACP) -fp $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(PRIVATE_DIR)/tools
 +      $(hide) $(ACP) -fp $(VMTESTSTF_JAR) $(CTS_TESTCASES_OUT)
 +      $(hide) $(ACP) -fp $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(ADDITIONAL_TF_JARS) $(CTS_TF_README_PATH) $(PRIVATE_DIR)/tools
+       $(hide) $(call copy-files-with-structure, $(CTS_SHARED_LIBS),$(HOST_OUT)/,$(PRIVATE_DIR))
 -# Change mode of the executables
 -      $(foreach jar,$(CTS_TEST_JAR_LIST),$(call copy-testcase-jar,$(jar)))
 -      $(foreach testcase,$(CTS_TEST_CASES),$(call copy-testcase,$(testcase)))
        $(hide) touch $@
  
  # Generate the test descriptions for the core-tests