am b1b8a831: am e66798b1: DO NOT MERGE ICS MR1 Backport of Some Tests
* commit 'b1b8a831627ec20a5a8f360aac57575a5b273161':
DO NOT MERGE ICS MR1 Backport of Some Tests
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index b4dc4dd..f87d3a3 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -38,8 +38,6 @@
CtsBluetoothTestCases \
CtsContentTestCases \
CtsDatabaseTestCases \
- CtsDelegatingAccessibilityService \
- CtsDeviceAdmin \
CtsDpiTestCases \
CtsDpiTestCases2 \
CtsDrmTestCases \
@@ -72,16 +70,18 @@
CtsUtilTestCases \
CtsViewTestCases \
CtsWebkitTestCases \
- CtsWidgetTestCases \
- SignatureTest \
- TestDeviceSetup \
- $(CTS_SECURITY_APPS_LIST)
+ CtsWidgetTestCases
CTS_TEST_CASE_LIST := \
+ TestDeviceSetup \
+ CtsDelegatingAccessibilityService \
+ CtsDeviceAdmin \
com.replica.replicaisland \
+ SignatureTest \
ApiDemos \
ApiDemosReferenceTest \
$(CTS_COVERAGE_TEST_CASE_LIST) \
+ $(CTS_SECURITY_APPS_LIST)
CTS_NATIVE_EXES := \
CtsNativeMediaTestCases
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
index b536102..c28631b 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
@@ -31,7 +31,7 @@
@Option(name="cts-install-path", description="the path to the cts installation to use")
private String mCtsRootDirPath = System.getProperty("CTS_ROOT");
- public static final String CTS_BUILD_VERSION = "4.0.3_r2";
+ public static final String CTS_BUILD_VERSION = "4.0.3_r1";
/**
* {@inheritDoc}