Merge "cts: Add all tests to general-tests"
This commit is contained in:
committed by
Android (Google) Code Review
commit
cbf124e9c5
@@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed
|
||||
LOCAL_CTS_TEST_PACKAGE := android.net.hostsidenetwork
|
||||
|
||||
# Tag this module as a cts test artifact
|
||||
LOCAL_COMPATIBILITY_SUITE := cts
|
||||
LOCAL_COMPATIBILITY_SUITE := cts general-tests
|
||||
|
||||
include $(BUILD_CTS_HOST_JAVA_LIBRARY)
|
||||
|
||||
|
||||
@@ -31,6 +31,6 @@ LOCAL_PROGUARD_ENABLED := disabled
|
||||
LOCAL_DEX_PREOPT := false
|
||||
|
||||
# Tag this module as a cts test artifact
|
||||
LOCAL_COMPATIBILITY_SUITE := cts
|
||||
LOCAL_COMPATIBILITY_SUITE := cts general-tests
|
||||
|
||||
include $(BUILD_CTS_SUPPORT_PACKAGE)
|
||||
|
||||
@@ -30,6 +30,6 @@ LOCAL_PROGUARD_ENABLED := disabled
|
||||
LOCAL_DEX_PREOPT := false
|
||||
|
||||
# Tag this module as a cts test artifact
|
||||
LOCAL_COMPATIBILITY_SUITE := cts
|
||||
LOCAL_COMPATIBILITY_SUITE := cts general-tests
|
||||
|
||||
include $(BUILD_CTS_SUPPORT_PACKAGE)
|
||||
|
||||
@@ -47,7 +47,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
|
||||
#LOCAL_SDK_VERSION := current
|
||||
|
||||
# Tag this module as a cts test artifact
|
||||
LOCAL_COMPATIBILITY_SUITE := cts
|
||||
LOCAL_COMPATIBILITY_SUITE := cts general-tests
|
||||
|
||||
include $(BUILD_CTS_PACKAGE)
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ LOCAL_PACKAGE_NAME := CtsNetTestAppForApi23
|
||||
LOCAL_SDK_VERSION := 23
|
||||
|
||||
# Tag this module as a cts test artifact
|
||||
LOCAL_COMPATIBILITY_SUITE := cts
|
||||
LOCAL_COMPATIBILITY_SUITE := cts general-tests
|
||||
|
||||
include $(BUILD_CTS_PACKAGE)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user