From a9e563cf831498fd7d0788610ca22e0c64815d9b Mon Sep 17 00:00:00 2001 From: Stuart Scott Date: Thu, 18 Feb 2016 19:25:52 -0800 Subject: [PATCH] Switch to CTSv2 bug:21762834 Change-Id: Ie51a0ed4560b46c2f360e14980e5fab7fe6479fe --- tests/cts/hostside/Android.mk | 6 +++--- tests/cts/hostside/app/Android.mk | 4 ++-- tests/cts/net/Android.mk | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/cts/hostside/Android.mk b/tests/cts/hostside/Android.mk index b4e1e3dafe..ad97ecdc6b 100644 --- a/tests/cts/hostside/Android.mk +++ b/tests/cts/hostside/Android.mk @@ -21,14 +21,14 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE := CtsHostsideNetworkTests -LOCAL_JAVA_LIBRARIES := cts-tradefed_v2 compatibility-host-util tradefed-prebuilt +LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib LOCAL_CTS_TEST_PACKAGE := android.net.hostsidenetwork -# 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 include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/tests/cts/hostside/app/Android.mk b/tests/cts/hostside/app/Android.mk index b64c4c95f2..7f8da07943 100644 --- a/tests/cts/hostside/app/Android.mk +++ b/tests/cts/hostside/app/Android.mk @@ -29,7 +29,7 @@ LOCAL_PACKAGE_NAME := CtsHostsideNetworkTestsApp LOCAL_PROGUARD_ENABLED := disabled LOCAL_DEX_PREOPT := false -# 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 include $(BUILD_CTS_SUPPORT_PACKAGE) diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk index 608ea47bc7..c553a9bb2e 100644 --- a/tests/cts/net/Android.mk +++ b/tests/cts/net/Android.mk @@ -40,8 +40,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := core-tests-support ctsdeviceutil \ # uncomment when b/13249961 is fixed #LOCAL_SDK_VERSION := current -# 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 include $(BUILD_CTS_PACKAGE)