CTS: Add application security tests to makefile

Change-Id: I51291d338cca88fed68247efbecbaf747306c6b7

diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index 17af65f..2514e64 100644 (file)
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -26,6 +26,7 @@ endif
 CTS_HOST_JAR := $(HOST_OUT_JAVA_LIBRARIES)/cts.jar
 
 junit_host_jar := $(HOST_OUT_JAVA_LIBRARIES)/junit.jar
+HOSTTESTLIB_JAR := $(HOST_OUT_JAVA_LIBRARIES)/hosttestlib.jar
 
 CTS_CORE_CASE_LIST := android.core.tests.annotation \
        android.core.tests.archive \
@@ -49,6 +50,18 @@ CTS_CORE_CASE_LIST := android.core.tests.annotation \
        android.core.tests.xnet \
        android.core.tests.runner
 
+CTS_SECURITY_APPS_LIST := \
+       CtsAppAccessData \
+       CtsAppWithData \
+       CtsInstrumentationAppDiffCert \
+       CtsPermissionDeclareApp \
+       CtsSharedUidInstall \
+       CtsSharedUidInstallDiffCert \
+       CtsSimpleAppInstall \
+       CtsSimpleAppInstallDiffCert \
+       CtsTargetInstrumentationApp \
+       CtsUsePermissionDiffCert
+
 CTS_CASE_LIST := \
        DeviceInfoCollector \
        CtsTestStubs \
@@ -78,13 +91,14 @@ CTS_CASE_LIST := \
        CtsPerformance5TestCases \
        ApiDemos \
        ApiDemosReferenceTest \
-       $(CTS_CORE_CASE_LIST)
+       $(CTS_CORE_CASE_LIST) \
+       $(CTS_SECURITY_APPS_LIST)
 
 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) $(ACP)
+$(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(HOSTTESTLIB_JAR) $(ACP)
 # Make necessary directory for CTS
        @rm -rf $(PRIVATE_CTS_DIR)
        @mkdir -p $(TMP_DIR)
@@ -97,6 +111,8 @@ $(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) $(junit_host_jar) $(ACP)
        $(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
 # Change mode of the executables
        $(hide) chmod ug+rwX $(PRIVATE_DIR)/tools/$(notdir $(CTS_EXECUTABLE_PATH))
        $(foreach apk,$(CTS_CASE_LIST), \
@@ -218,9 +234,15 @@ $(CORE_VM_TEST_DESC): vm-tests $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar $(CORE_INT
                dot.junit.AllJunitHostTests, cts/tools/vm-tests/Android.mk)
        $(ACP) -fv $(VMTESTS_INTERMEDIATES)/android.core.vm-tests.jar $(PRIVATE_DIR)/repository/testcases/android.core.vm-tests.jar
 
+# Move app security host-side tests to the repository
+APP_SECURITY_LIB := $(cts_dir)/$(cts_name)/repository/testcases/CtsAppSecurityTests.jar
+
+$(APP_SECURITY_LIB):
+       $(ACP) -fv $(HOST_OUT_JAVA_LIBRARIES)/CtsAppSecurityTests.jar $(APP_SECURITY_LIB)
+
 # Generate the default test plan for User.
 # Usage: buildCts.py <testRoot> <ctsOutputDir> <tempDir> <androidRootDir> <docletPath>
-$(DEFAULT_TEST_PLAN): $(cts_dir)/all_cts_files_stamp $(cts_dir)/all_cts_core_files_stamp $(cts_tools_src_dir)/utils/buildCts.py $(CORE_VM_TEST_DESC) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar
+$(DEFAULT_TEST_PLAN): $(cts_dir)/all_cts_files_stamp $(cts_dir)/all_cts_core_files_stamp $(cts_tools_src_dir)/utils/buildCts.py $(CORE_VM_TEST_DESC) $(APP_SECURITY_LIB) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar
        $(hide) $(cts_tools_src_dir)/utils/buildCts.py cts/tests/tests/ $(PRIVATE_DIR) $(TMP_DIR) \
                $(TOP) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar