From 12b3fccbbc3f42e0f5e09019d552d04d56cccaff Mon Sep 17 00:00:00 2001 From: Stuart Scott Date: Mon, 29 Feb 2016 13:09:58 -0800 Subject: [PATCH] Switch to CTSv2 bug:21762834 Change-Id: Ic56a6e9bdb932dc1ed76c0d11bc9788b8494d1a5 --- android/cts/Android.mk | 6 +++--- android/cts/runner/tests/Android.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/cts/Android.mk b/android/cts/Android.mk index aec038a..d43624f 100644 --- a/android/cts/Android.mk +++ b/android/cts/Android.mk @@ -20,13 +20,13 @@ LOCAL_MODULE := CtsDeqpTestCases LOCAL_MODULE_TAGS := optional -# Tag this module as a cts_v2 test artifact -LOCAL_COMPATIBILITY_SUITE := cts_v2 +# Tag this module as a cts test artifact +LOCAL_COMPATIBILITY_SUITE := cts LOCAL_SDK_VERSION := 22 LOCAL_SRC_FILES := $(call all-java-files-under, runner/src) -LOCAL_JAVA_LIBRARIES := cts-tradefed_v2 compatibility-host-util tradefed-prebuilt +LOCAL_JAVA_LIBRARIES := cts-tradefed compatibility-host-util tradefed-prebuilt DEQP_CASELISTS:=$(sort $(patsubst master/%,%, \ $(shell cd $(LOCAL_PATH) ; \ diff --git a/android/cts/runner/tests/Android.mk b/android/cts/runner/tests/Android.mk index 2e0c233..7fc1056 100644 --- a/android/cts/runner/tests/Android.mk +++ b/android/cts/runner/tests/Android.mk @@ -21,7 +21,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE := CtsDeqpRunnerTests LOCAL_MODULE_TAGS := optional -LOCAL_JAVA_LIBRARIES := cts-tradefed_v2 compatibility-host-util tradefed-prebuilt CtsDeqpTestCases +LOCAL_JAVA_LIBRARIES := cts-tradefed compatibility-host-util tradefed-prebuilt CtsDeqpTestCases LOCAL_STATIC_JAVA_LIBRARIES := easymock include $(BUILD_HOST_JAVA_LIBRARY) -- 2.7.4