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

Commit 45a971d9 authored by Brian Muramatsu's avatar Brian Muramatsu
Browse files

Support Additional CTS Host Jars 

Include another optional Makefile from the CTS project that
specifies additional JARs that the CTS host may need. This
will make it easier to create modules in the CTS project
that can be built for the host and device and shared between
the host and test cases.

The first such library will include annotations like
"RequiresFeature" and "SupportsProfile" that will be needed
to support multiple device profiles in CTS.

Another planned libraries could include defining the CTS
version number in a central spot and sharing code used to
probe for certain properties like the OpenGL version and
other system properties.

Can be checked in after this other change without causing
breakage: https://review.source.android.com/#change,16740

Change-Id: I3c488247b66522dc86277ab43198c34f790e0618
parent 817a8ac9

core/tasks/cts.mk

+4 −8
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ DEFAULT_TEST_PLAN := $(PRIVATE_DIR)/resource/plans 


$(cts_dir)/all_cts_files_stamp: PRIVATE_JUNIT_HOST_JAR := $(junit_host_jar)



$(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(HOSTTESTLIB_JAR) $(ACP)

-include cts/CtsHostLibraryList.mk

$(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(ACP)

# Make necessary directory for CTS

	@rm -rf $(PRIVATE_CTS_DIR)

	@mkdir -p $(TMP_DIR)
@@ -65,13 +66,8 @@ $(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(HOSTTESTLIB 
	@mkdir -p $(PRIVATE_DIR)/tools

	@mkdir -p $(PRIVATE_DIR)/repository/testcases

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

# Copy executable to CTS directory

	$(hide) $(ACP) -fp $(CTS_HOST_JAR) $(PRIVATE_DIR)/tools

	$(hide) $(ACP) -fp $(CTS_EXECUTABLE_PATH) $(PRIVATE_DIR)/tools

# Copy junit jar

	$(hide) $(ACP) -fp $(PRIVATE_JUNIT_HOST_JAR) $(PRIVATE_DIR)/tools

# Copy hosttestlib jar

	$(hide) $(ACP) -fp $(HOSTTESTLIB_JAR) $(PRIVATE_DIR)/tools

# Copy executable and JARs to CTS directory

	$(hide) $(ACP) -fp $(CTS_HOST_JAR) $(CTS_EXECUTABLE_PATH) $(PRIVATE_JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(PRIVATE_DIR)/tools

# Change mode of the executables

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

	$(foreach apk,$(CTS_CASE_LIST), \