LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Switch to CTSv2" into nyc-dev

Browse Source 
am: 7c4a698a0b

* commit '7c4a698a0b45674fa8a83d497e982e537915a31a':
  Switch to CTSv2
This commit is contained in:
Stuart Scott
2016-03-01 07:44:43 +00:00
committed by android-build-merger
parent b917f628e9 a9e563cf83
commit 9f75663841
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cts/hostside/Android.mk
View File

@@ -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)

4
tests/cts/hostside/app/Android.mk
View File

@@ -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)

4
tests/cts/net/Android.mk
View File

@@ -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)