Move to android.support.test as CTS instrumentation runner.
Also do the following related cleanup
- Remove references to deprecated BrokenTest and KnownFailure
- Switch CTS tests to build against SDK and not private
android.test.runner where possible
Bug: 12924356
Change-Id: If6151b836456eec4838f8d7d6e11c9834c007fca
diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk
index 1653335..da19a4d 100644
--- a/tests/cts/net/Android.mk
+++ b/tests/cts/net/Android.mk
@@ -21,7 +21,7 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_JAVA_LIBRARIES := android.test.runner voip-common conscrypt
+LOCAL_JAVA_LIBRARIES := voip-common conscrypt
LOCAL_JNI_SHARED_LIBRARIES := libnativedns_jni
@@ -33,7 +33,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestserver ctsdeviceutil ctstestrunner \
core-tests-support
-# uncomment when dalvik.annotation.Test* are removed or part of SDK
+# uncomment when b/13249961 is fixed
#LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)