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

Commit 976fbcbd authored by Brian Muramatsu's avatar Brian Muramatsu Committed by Android Git Automerger
Browse files

am e43794ac: am 277be2fe: Stop Packaging Old CTS Test Runner Files 

* commit 'e43794ac':
  Stop Packaging Old CTS Test Runner Files
parents 0c8f79dd e43794ac

core/tasks/cts.mk

+1 −12
Original line number Diff line number Diff line
@@ -17,14 +17,6 @@ cts_tools_src_dir := cts/tools 


cts_name := android-cts



CTS_EXECUTABLE := startcts

ifeq ($(HOST_OS),windows)

    CTS_EXECUTABLE_PATH := $(cts_tools_src_dir)/host/etc/cts.bat

else

    CTS_EXECUTABLE_PATH := $(cts_tools_src_dir)/utils/$(CTS_EXECUTABLE)

endif

CTS_HOST_JAR := $(HOST_OUT_JAVA_LIBRARIES)/cts.jar



DDMLIB_JAR := $(HOST_OUT_JAVA_LIBRARIES)/ddmlib-prebuilt.jar

junit_host_jar := $(HOST_OUT_JAVA_LIBRARIES)/junit.jar

HOSTTESTLIB_JAR := $(HOST_OUT_JAVA_LIBRARIES)/hosttestlib.jar
@@ -59,13 +51,10 @@ $(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(HOSTTESTLIB 
	$(hide) mkdir -p $(PRIVATE_DIR)/repository/testcases

	$(hide) mkdir -p $(PRIVATE_DIR)/repository/plans

# Copy executable and JARs to CTS directory

	$(hide) $(ACP) -fp $(CTS_HOST_JAR) $(CTS_EXECUTABLE_PATH) $(DDMLIB_JAR) $(PRIVATE_JUNIT_HOST_JAR) $(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 $(DDMLIB_JAR) $(PRIVATE_JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(PRIVATE_DIR)/tools

# Change mode of the executables

	$(hide) chmod ug+rwX $(PRIVATE_DIR)/tools/$(notdir $(CTS_EXECUTABLE_PATH))

	$(foreach apk,$(CTS_CASE_LIST), \

			$(call copy-testcase-apk,$(apk)))

# Copy CTS host config to CTS directory

	$(hide) $(ACP) -fp $(cts_tools_src_dir)/utils/host_config.xml $(PRIVATE_DIR)/repository/

	$(hide) touch $@



# Generate the test descriptions for the core-tests