am a3eea3b0: am a2aa2781: Merge "Test versioned RS bitcode in CTS."
* commit 'a3eea3b0ff21999fd33bc47db2be4b059a91a4d9':
Test versioned RS bitcode in CTS.
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index c4b892e..5d9945e 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -38,8 +38,6 @@
CtsBluetoothTestCases \
CtsContentTestCases \
CtsDatabaseTestCases \
- CtsDelegatingAccessibilityService \
- CtsDeviceAdmin \
CtsDpiTestCases \
CtsDpiTestCases2 \
CtsDrmTestCases \
@@ -73,16 +71,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}