Bump CTS tradefed version to 5.0_r1
All known issues resolved and ready for release, also cleaning up the sample code
Bug: 17927282
Change-Id: Ib4d4fcbb2af93de7f5668005102d88817ec62ce4
diff --git a/tests/expectations/unsupportedabis.txt b/tests/expectations/unsupportedabis.txt
index 817179b..7ad3682 100644
--- a/tests/expectations/unsupportedabis.txt
+++ b/tests/expectations/unsupportedabis.txt
@@ -9,11 +9,7 @@
"android.renderscriptlegacy.cts.LeakTest",
"android.renderscriptlegacy.cts.RSBase",
"android.renderscriptlegacy.cts.RSBaseCompute",
- "android.renderscriptlegacy.cts.VersionTest",
- "android.sample.cts.SampleDeviceResultTest",
- "android.sample.cts.SampleDeviceTest",
- "android.sample.cts.SampleHostResultTest",
- "android.sample.cts.SampleHostTest"
+ "android.renderscriptlegacy.cts.VersionTest"
]
}
]
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 27f9135..e0cfee1 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 = "5.0_r0.5";
+ public static final String CTS_BUILD_VERSION = "5.0_r1";
/**
* {@inheritDoc}