diff options
496 files changed, 523 insertions, 523 deletions
diff --git a/apps/EmptyDeviceAdmin/Android.mk b/apps/EmptyDeviceAdmin/Android.mk index 6ee3943b293..3d76129b6e9 100644 --- a/apps/EmptyDeviceAdmin/Android.mk +++ b/apps/EmptyDeviceAdmin/Android.mk @@ -29,6 +29,6 @@ LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res 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) diff --git a/apps/PermissionApp/Android.mk b/apps/PermissionApp/Android.mk index 50b17596a50..4bcc58531f8 100644 --- a/apps/PermissionApp/Android.mk +++ b/apps/PermissionApp/Android.mk @@ -29,6 +29,6 @@ LOCAL_PACKAGE_NAME := CtsPermissionApp 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) diff --git a/hostsidetests/aadb/Android.mk b/hostsidetests/aadb/Android.mk index 5cc2c10e7a4..203151b145a 100644 --- a/hostsidetests/aadb/Android.mk +++ b/hostsidetests/aadb/Android.mk @@ -27,7 +27,7 @@ LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed LOCAL_CTS_TEST_PACKAGE := android.aadb # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/abioverride/Android.mk b/hostsidetests/abioverride/Android.mk index 88c44d937bf..9b929856aab 100644 --- a/hostsidetests/abioverride/Android.mk +++ b/hostsidetests/abioverride/Android.mk @@ -23,7 +23,7 @@ LOCAL_MODULE := CtsAbiOverrideHostTestCases LOCAL_MODULE_TAGS := tests # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.host.abioverride diff --git a/hostsidetests/abioverride/app/Android.mk b/hostsidetests/abioverride/app/Android.mk index cdf063cf7c8..e49622c32cf 100755 --- a/hostsidetests/abioverride/app/Android.mk +++ b/hostsidetests/abioverride/app/Android.mk @@ -34,7 +34,7 @@ LOCAL_JNI_SHARED_LIBRARIES := libctsabioverride LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsAbiOverrideTestApp diff --git a/hostsidetests/appsecurity/Android.mk b/hostsidetests/appsecurity/Android.mk index 6afcce8fb38..fa78eab248c 100644 --- a/hostsidetests/appsecurity/Android.mk +++ b/hostsidetests/appsecurity/Android.mk @@ -28,7 +28,7 @@ LOCAL_JAVA_RESOURCE_DIRS := res LOCAL_CTS_TEST_PACKAGE := android.appsecurity # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/appsecurity/test-apps/Android.mk b/hostsidetests/appsecurity/test-apps/Android.mk index 1d4e58fa7bc..446e047a8d7 100644 --- a/hostsidetests/appsecurity/test-apps/Android.mk +++ b/hostsidetests/appsecurity/test-apps/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # Build the test APKs using their own makefiles include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk b/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk index 606b9ce93ee..fb895ce4c00 100644 --- a/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk +++ b/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk @@ -26,7 +26,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_PACKAGE_NAME := CtsAppAccessData # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # although not strictly necessary, sign this app with different cert than CtsAppWithData LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2 diff --git a/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk b/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk index 110928089c6..d571460c00d 100644 --- a/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk +++ b/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk @@ -26,7 +26,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_PACKAGE_NAME := CtsAppWithData # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 diff --git a/hostsidetests/appsecurity/test-apps/DeclareNotRuntimePermissions/Android.mk b/hostsidetests/appsecurity/test-apps/DeclareNotRuntimePermissions/Android.mk index b98ba686bdc..13119445482 100644 --- a/hostsidetests/appsecurity/test-apps/DeclareNotRuntimePermissions/Android.mk +++ b/hostsidetests/appsecurity/test-apps/DeclareNotRuntimePermissions/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_PACKAGE_NAME := CtsDeclareNonRuntimePermissions -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk b/hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk index ec89ce9d4e7..60ece87f32c 100644 --- a/hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk +++ b/hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk @@ -27,7 +27,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsDocumentClient # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2 diff --git a/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk b/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk index 915d43266a1..0084eb3350b 100644 --- a/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk +++ b/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk @@ -27,7 +27,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsDocumentProvider # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 diff --git a/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk b/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk index 930ac824478..a94b20623a1 100644 --- a/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk @@ -27,7 +27,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsEncryptionApp # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/Android.mk index e5cd607f4be..eadbb826f0e 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # Build the test APKs using their own makefiles include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk index b13432b222a..6d0a58957f4 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk @@ -27,7 +27,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ ctstestrunner # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.mk index 1dd66a69eca..a7078fed771 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := android-support-test # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk index 4cd5d79fca2..e7145360b42 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk @@ -24,7 +24,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ legacy-android-test # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.mk index afd8903542b..930370ad495 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := android-support-test # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.mk index 1b1ee7d7198..24d9f2a4230 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.mk @@ -24,7 +24,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ legacy-android-test # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.mk index e1547a1a4e5..5172dff5324 100644 --- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.mk @@ -23,7 +23,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ legacy-android-test # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res diff --git a/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/Android.mk b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/Android.mk index b1b7f8384ee..4e493877948 100644 --- a/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/Android.mk +++ b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsEscalateToRuntimePermissions -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PROGUARD_ENABLED := disabled diff --git a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk index 560607b0a7a..06918a40e3d 100644 --- a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk @@ -24,7 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsExternalStorageApp # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.mk b/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.mk index 101d5645ee1..5645a7f5248 100644 --- a/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.mk @@ -26,7 +26,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_PACKAGE_NAME := CtsInstantCookieApp -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PROGUARD_ENABLED := disabled diff --git a/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk index 31dcd583e14..b68ce437800 100644 --- a/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk +++ b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk @@ -26,7 +26,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_PACKAGE_NAME := CtsInstrumentationAppDiffCert # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # sign this app with different cert than CtsTargetInstrumentationApp LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2 diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.mk b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.mk index 8a7f8d9c316..9225ee257fc 100644 --- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.mk @@ -21,7 +21,7 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_EXPORT_PACKAGE_RESOURCES := true LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner android-support-test diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/Android.mk b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/Android.mk index 5a5ab0df277..15a0b259c4c 100644 --- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/Android.mk +++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_EXPORT_PACKAGE_RESOURCES := true LOCAL_PACKAGE_NAME := CtsIsolatedSplitAppFeatureA diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/Android.mk b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/Android.mk index 39111fc56bf..3b110853875 100644 --- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/Android.mk +++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsIsolatedSplitAppFeatureB LOCAL_SRC_FILES := $(call all-subdir-java-files) diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/Android.mk b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/Android.mk index 15beac40786..70880ba04cf 100644 --- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/Android.mk +++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsIsolatedSplitAppFeatureC LOCAL_SRC_FILES := $(call all-subdir-java-files) diff --git a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk index fd4d927762e..8187aff7e7c 100644 --- a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ LOCAL_PACKAGE_NAME := CtsMultiUserStorageApp # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/NoRestartApp/Android.mk b/hostsidetests/appsecurity/test-apps/NoRestartApp/Android.mk index 69d3b4a7836..31b683d92f0 100644 --- a/hostsidetests/appsecurity/test-apps/NoRestartApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/NoRestartApp/Android.mk @@ -23,7 +23,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := CtsNoRestartBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PROGUARD_ENABLED := disabled LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/NoRestartApp/feature/Android.mk b/hostsidetests/appsecurity/test-apps/NoRestartApp/feature/Android.mk index 204275bdeff..c92375ef800 100644 --- a/hostsidetests/appsecurity/test-apps/NoRestartApp/feature/Android.mk +++ b/hostsidetests/appsecurity/test-apps/NoRestartApp/feature/Android.mk @@ -23,7 +23,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := CtsNoRestartFeature LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PROGUARD_ENABLED := disabled LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.mk b/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.mk index d038a7010d2..f1dbf841222 100644 --- a/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.mk @@ -28,7 +28,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SRC_FILES := $(call all-java-files-under, src) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsPkgAccessApp diff --git a/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.mk b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.mk index e0e900e1679..780214b4bb8 100644 --- a/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.mk @@ -26,7 +26,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_PACKAGE_NAME := CtsPermissionDeclareApp # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # sign this app with a different cert than CtsUsePermissionDiffCert LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 diff --git a/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.mk b/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.mk index d4567e391b4..78b7f919d1a 100644 --- a/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.mk +++ b/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.mk @@ -26,7 +26,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_PACKAGE_NAME := CtsPermissionDeclareAppCompat # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # sign this app with a different cert than CtsUsePermissionDiffCert LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 diff --git a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk index bb171e2aa0a..199e429c259 100644 --- a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk @@ -25,7 +25,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctstestrunner # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PROGUARD_ENABLED := disabled LOCAL_DEX_PREOPT := false LOCAL_PACKAGE_NAME := CtsPrivilegedUpdateTests @@ -46,7 +46,7 @@ LOCAL_MODULE_CLASS := APPS LOCAL_BUILT_MODULE_STEM := package.apk # Make sure the build system doesn't try to resign the APK LOCAL_CERTIFICATE := PRESIGNED -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SRC_FILES := CtsShimPrivUpgrade.apk @@ -63,7 +63,7 @@ LOCAL_MODULE_CLASS := APPS LOCAL_BUILT_MODULE_STEM := package.apk # Make sure the build system doesn't try to resign the APK LOCAL_CERTIFICATE := PRESIGNED -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SRC_FILES := CtsShimPrivUpgradeWrongSHA.apk diff --git a/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk b/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk index adf6a1451d4..1bfc9205a18 100644 --- a/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ LOCAL_PACKAGE_NAME := CtsReadExternalStorageApp # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_DEX_PREOPT := false diff --git a/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.mk b/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.mk index 548e39739bf..3437b2f01f5 100644 --- a/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.mk @@ -26,7 +26,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_PACKAGE_NAME := CtsSharedUidInstall # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # sign this app with a different cert than CtsSharedUidInstallDiffCert LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 diff --git a/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.mk b/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.mk index 0f6cd6950e6..47b066adbad 100644 --- a/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.mk @@ -26,7 +26,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_PACKAGE_NAME := CtsSharedUidInstallDiffCert # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # sign this app with a different cert than CtsSharedUidInstall LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2 diff --git a/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.mk b/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.mk index a77a172485c..9309f17c929 100644 --- a/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.mk @@ -26,7 +26,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_PACKAGE_NAME := CtsSimpleAppInstall # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # sign this app with a different cert than CtsSimpleAppInstallDiffCert LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 diff --git a/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.mk b/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.mk index e478afb2cb6..fe69246c1e6 100644 --- a/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.mk @@ -26,7 +26,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_PACKAGE_NAME := CtsSimpleAppInstallDiffCert # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # sign this app with a different cert than CtsSimpleAppInstall LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2 diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk index e12feec7060..0ed7772b4ea 100644 --- a/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk @@ -28,7 +28,7 @@ LOCAL_PACKAGE_NAME := CtsSplitApp LOCAL_PACKAGE_SPLITS := mdpi-v4 hdpi-v4 xhdpi-v4 xxhdpi-v4 v7 fr de # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets @@ -56,7 +56,7 @@ LOCAL_PACKAGE_NAME := CtsSplitAppDiffRevision LOCAL_PACKAGE_SPLITS := v7 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MANIFEST_FILE := revision/AndroidManifest.xml LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 @@ -83,7 +83,7 @@ LOCAL_PACKAGE_NAME := CtsSplitAppDiffVersion LOCAL_PACKAGE_SPLITS := v7 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 LOCAL_AAPT_FLAGS := --version-code 101 --version-name OneHundredOne --replace-version @@ -109,7 +109,7 @@ LOCAL_PACKAGE_NAME := CtsSplitAppDiffCert LOCAL_PACKAGE_SPLITS := v7 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2 LOCAL_AAPT_FLAGS := --version-code 100 --version-name OneHundred --replace-version diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/feature/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/feature/Android.mk index aea49c609b6..0603cc72632 100644 --- a/hostsidetests/appsecurity/test-apps/SplitApp/feature/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SplitApp/feature/Android.mk @@ -29,7 +29,7 @@ LOCAL_AAPT_FLAGS := --version-code 100 --version-name OneHundred --replace-versi LOCAL_MODULE_TAGS := tests # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests featureOf := CtsSplitApp featureOfApk := $(call intermediates-dir-for,APPS,$(featureOf))/package.apk diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/jni/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/jni/Android.mk index b1e200208b8..e495ad3fa27 100644 --- a/hostsidetests/appsecurity/test-apps/SplitApp/jni/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SplitApp/jni/Android.mk @@ -24,6 +24,6 @@ LOCAL_SRC_FILES := com_android_cts_splitapp_Native.cpp LOCAL_LDLIBS += -llog # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_SHARED_LIBRARY) diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/libs/arm64-v8a/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/libs/arm64-v8a/Android.mk index 51b91a48105..fddee790a17 100644 --- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/arm64-v8a/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/arm64-v8a/Android.mk @@ -23,7 +23,7 @@ LOCAL_PACKAGE_NAME := CtsSplitApp_arm64-v8a LOCAL_JAVA_RESOURCE_DIRS := raw # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 LOCAL_AAPT_FLAGS := --version-code 100 --replace-version diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi-v7a/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi-v7a/Android.mk index dc1d703c078..cddda28d73b 100644 --- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi-v7a/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi-v7a/Android.mk @@ -23,7 +23,7 @@ LOCAL_PACKAGE_NAME := CtsSplitApp_armeabi-v7a LOCAL_JAVA_RESOURCE_DIRS := raw # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 LOCAL_AAPT_FLAGS := --version-code 100 --replace-version diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi/Android.mk index 28c21906505..9b67d24411c 100644 --- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi/Android.mk @@ -23,7 +23,7 @@ LOCAL_PACKAGE_NAME := CtsSplitApp_armeabi LOCAL_JAVA_RESOURCE_DIRS := raw # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 LOCAL_AAPT_FLAGS := --version-code 100 --replace-version diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips/Android.mk index d1565e683b0..aed7253104c 100644 --- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips/Android.mk @@ -23,7 +23,7 @@ LOCAL_PACKAGE_NAME := CtsSplitApp_mips LOCAL_JAVA_RESOURCE_DIRS := raw # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 LOCAL_AAPT_FLAGS := --version-code 100 --replace-version diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips64/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips64/Android.mk index 383030cba43..7798a0c4470 100644 --- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips64/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips64/Android.mk @@ -23,7 +23,7 @@ LOCAL_PACKAGE_NAME := CtsSplitApp_mips64 LOCAL_JAVA_RESOURCE_DIRS := raw # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 LOCAL_AAPT_FLAGS := --version-code 100 --replace-version diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86/Android.mk index e9e71ee285a..8f604d30dd0 100644 --- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86/Android.mk @@ -23,7 +23,7 @@ LOCAL_PACKAGE_NAME := CtsSplitApp_x86 LOCAL_JAVA_RESOURCE_DIRS := raw # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 LOCAL_AAPT_FLAGS := --version-code 100 --replace-version diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86_64/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86_64/Android.mk index 87f0e4ad5eb..cf3dca1aec3 100644 --- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86_64/Android.mk +++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86_64/Android.mk @@ -23,7 +23,7 @@ LOCAL_PACKAGE_NAME := CtsSplitApp_x86_64 LOCAL_JAVA_RESOURCE_DIRS := raw # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 LOCAL_AAPT_FLAGS := --version-code 100 --replace-version diff --git a/hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk b/hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk index 6367912f7ab..eb9061251e7 100644 --- a/hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk +++ b/hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk @@ -24,7 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, ../StorageApp/src/) LOCAL_PACKAGE_NAME := CtsStorageAppA -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_DEX_PREOPT := false include $(BUILD_CTS_SUPPORT_PACKAGE) diff --git a/hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk b/hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk index 2177da1ba5e..21f24704be2 100644 --- a/hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk +++ b/hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk @@ -24,7 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, ../StorageApp/src/) LOCAL_PACKAGE_NAME := CtsStorageAppB -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_DEX_PREOPT := false include $(BUILD_CTS_SUPPORT_PACKAGE) diff --git a/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk b/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk index 8b6d6804035..92f4bbf6999 100644 --- a/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk @@ -25,7 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ LOCAL_PACKAGE_NAME := CtsStorageStatsApp -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_DEX_PREOPT := false include $(BUILD_CTS_SUPPORT_PACKAGE) diff --git a/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.mk b/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.mk index bfedb36a43a..c3da07a2784 100644 --- a/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.mk @@ -26,7 +26,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_PACKAGE_NAME := CtsTargetInstrumentationApp # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # sign this app with different cert than CtsInstrumentationAppDiffCert LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1 diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk index f8db5aa189a..8e51f22101c 100644 --- a/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk +++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk @@ -34,7 +34,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ LOCAL_PACKAGE_NAME := CtsUsePermissionApp22 # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2 diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk index 9e6ea3ecb2b..5e623d86301 100644 --- a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk +++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk @@ -32,7 +32,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ LOCAL_PACKAGE_NAME := CtsUsePermissionApp23 # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2 diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp24/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionApp24/Android.mk index 739f220644c..a71f48b2d53 100644 --- a/hostsidetests/appsecurity/test-apps/UsePermissionApp24/Android.mk +++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp24/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ LOCAL_PACKAGE_NAME := CtsUsePermissionApp24 # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2 diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk index bda678242b5..49f0289ca2e 100644 --- a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk +++ b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk @@ -27,7 +27,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_PACKAGE_NAME := CtsUsePermissionDiffCert # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # sign this app with a different cert than CtsPermissionDeclareApp LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2 diff --git a/hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk b/hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk index 581af789176..7e5627f3308 100644 --- a/hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ LOCAL_PACKAGE_NAME := CtsUsesLibraryApp # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2 diff --git a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk index 3893b7a6389..05ef8b05453 100644 --- a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk @@ -25,7 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ ../ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsWriteExternalStorageApp diff --git a/hostsidetests/appsecurity/test-apps/keysets/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/Android.mk index 7f116be55dc..5b5fbed61c6 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # Build the test APKs using their own makefiles include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.mk index 30384d0b088..9de77f522f2 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current diff --git a/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.mk index da4580429b6..5b75c49f2d7 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current diff --git a/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.mk index eea2e11b1ee..41415e9f1f1 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current diff --git a/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.mk index cefe00f12a8..c4bc3a32bc5 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.mk @@ -24,7 +24,7 @@ LOCAL_PACKAGE_NAME := CtsKeySetPermDefSigningA LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a 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) @@ -38,6 +38,6 @@ LOCAL_PACKAGE_NAME := CtsKeySetPermDefSigningB LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b 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) diff --git a/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.mk index f031e4bdcfa..78b00b3c9db 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.mk @@ -25,7 +25,7 @@ LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test 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) @@ -40,6 +40,6 @@ LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test 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) diff --git a/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk index d1eeffab7ad..c95f8b9a702 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/appsecurity/test-apps/keysets/uA/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/uA/Android.mk index 22c45a7935c..de64186c427 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/uA/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/uA/Android.mk @@ -23,7 +23,7 @@ LOCAL_PACKAGE_NAME := CtsKeySetSigningAUpgradeA LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a 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) @@ -36,7 +36,7 @@ LOCAL_PACKAGE_NAME := CtsKeySetSigningBUpgradeA LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b 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) @@ -49,7 +49,7 @@ LOCAL_PACKAGE_NAME := CtsKeySetSigningEcAUpgradeA LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-ec-a 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) @@ -63,6 +63,6 @@ LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test LOCAL_ADDITIONAL_CERTIFICATES := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b 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) diff --git a/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.mk index 340e8c73bda..d60df9dca62 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current diff --git a/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.mk index 6389bf6cc3b..54ecb5755b9 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current diff --git a/hostsidetests/appsecurity/test-apps/keysets/uB/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/uB/Android.mk index 1e888ae90c0..e953f17a58c 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/uB/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/uB/Android.mk @@ -25,7 +25,7 @@ LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test 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) @@ -40,7 +40,7 @@ LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test 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) @@ -56,6 +56,6 @@ LOCAL_ADDITIONAL_CERTIFICATES := cts/hostsidetests/appsecurity/certs/keysets/cts 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) diff --git a/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.mk index 87a7ff88df9..a77483228dd 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.mk @@ -25,7 +25,7 @@ LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test 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) @@ -40,6 +40,6 @@ LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test 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) diff --git a/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.mk index 42f700e5ba6..683d53340a7 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current diff --git a/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.mk index 69d27ed7a8a..afb0590dca4 100644 --- a/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.mk +++ b/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SDK_VERSION := current diff --git a/hostsidetests/appsecurity/test-apps/tinyapp/Android.mk b/hostsidetests/appsecurity/test-apps/tinyapp/Android.mk index 15981f699ad..adfce126084 100644 --- a/hostsidetests/appsecurity/test-apps/tinyapp/Android.mk +++ b/hostsidetests/appsecurity/test-apps/tinyapp/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/atrace/Android.mk b/hostsidetests/atrace/Android.mk index c4a091310ae..908176c0aff 100644 --- a/hostsidetests/atrace/Android.mk +++ b/hostsidetests/atrace/Android.mk @@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed LOCAL_CTS_TEST_PACKAGE := android.host.atrace # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/atrace/AtraceTestApp/Android.mk b/hostsidetests/atrace/AtraceTestApp/Android.mk index 9218e56fa11..e99d4d14454 100644 --- a/hostsidetests/atrace/AtraceTestApp/Android.mk +++ b/hostsidetests/atrace/AtraceTestApp/Android.mk @@ -31,6 +31,6 @@ LOCAL_PACKAGE_NAME := CtsAtraceTestApp #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) diff --git a/hostsidetests/bootstats/Android.mk b/hostsidetests/bootstats/Android.mk index 24e2f8b29f7..0849f823400 100644 --- a/hostsidetests/bootstats/Android.mk +++ b/hostsidetests/bootstats/Android.mk @@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util host-libpr LOCAL_CTS_TEST_PACKAGE := android.bootstats # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/compilation/Android.mk b/hostsidetests/compilation/Android.mk index 723e5c3fe98..88339b9ce3d 100644 --- a/hostsidetests/compilation/Android.mk +++ b/hostsidetests/compilation/Android.mk @@ -23,7 +23,7 @@ LOCAL_JAVA_RESOURCE_DIRS := assets/ LOCAL_MODULE_TAGS := tests # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE := CtsCompilationTestCases diff --git a/hostsidetests/compilation/app/Android.mk b/hostsidetests/compilation/app/Android.mk index 5bcf108dc2f..d2f38dbf282 100644 --- a/hostsidetests/compilation/app/Android.mk +++ b/hostsidetests/compilation/app/Android.mk @@ -26,6 +26,6 @@ LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := CtsCompilationApp # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_SUPPORT_PACKAGE) diff --git a/hostsidetests/content/Android.mk b/hostsidetests/content/Android.mk index 342c8f5b57a..62708f04b54 100644 --- a/hostsidetests/content/Android.mk +++ b/hostsidetests/content/Android.mk @@ -25,7 +25,7 @@ LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util LOCAL_CTS_TEST_PACKAGE := android.content -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/content/test-apps/CtsSyncAccountAccessOtherCertTests/Android.mk b/hostsidetests/content/test-apps/CtsSyncAccountAccessOtherCertTests/Android.mk index 7ec863089be..6cf5d9ddcf9 100644 --- a/hostsidetests/content/test-apps/CtsSyncAccountAccessOtherCertTests/Android.mk +++ b/hostsidetests/content/test-apps/CtsSyncAccountAccessOtherCertTests/Android.mk @@ -31,7 +31,7 @@ LOCAL_PACKAGE_NAME := CtsSyncAccountAccessOtherCertTestCases LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2 -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PROGUARD_ENABLED := disabled diff --git a/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/Android.mk b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/Android.mk index 0b63c14ebc0..dd219d95381 100644 --- a/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/Android.mk +++ b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsSyncAccountAccessSameCertTestCases -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PROGUARD_ENABLED := disabled diff --git a/hostsidetests/content/test-apps/SyncAccountAccessStubs/Android.mk b/hostsidetests/content/test-apps/SyncAccountAccessStubs/Android.mk index 4c817d92a0b..fc7cd4d5b95 100644 --- a/hostsidetests/content/test-apps/SyncAccountAccessStubs/Android.mk +++ b/hostsidetests/content/test-apps/SyncAccountAccessStubs/Android.mk @@ -24,7 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsSyncAccountAccessStubs -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PROGUARD_ENABLED := disabled diff --git a/hostsidetests/cpptools/Android.mk b/hostsidetests/cpptools/Android.mk index 67acb25c1f6..97329ccdf42 100644 --- a/hostsidetests/cpptools/Android.mk +++ b/hostsidetests/cpptools/Android.mk @@ -28,7 +28,7 @@ LOCAL_JAVA_LIBRARIES := ddmlib-prebuilt tradefed LOCAL_CTS_TEST_PACKAGE := android.tests.cpptools # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/cpptools/app/Android.mk b/hostsidetests/cpptools/app/Android.mk index 4e4e51fbc26..347412aa2ea 100644 --- a/hostsidetests/cpptools/app/Android.mk +++ b/hostsidetests/cpptools/app/Android.mk @@ -27,7 +27,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsCppToolsApp # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/hostsidetests/devicepolicy/Android.mk b/hostsidetests/devicepolicy/Android.mk index 1828e2c2b99..1de6b93d25b 100644 --- a/hostsidetests/devicepolicy/Android.mk +++ b/hostsidetests/devicepolicy/Android.mk @@ -27,7 +27,7 @@ LOCAL_JAVA_LIBRARIES := tools-common-prebuilt cts-tradefed tradefed compatibilit LOCAL_CTS_TEST_PACKAGE := android.adminhostside # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk b/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk index 6454e46f978..fa92b8b4627 100644 --- a/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk +++ b/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsAccountCheckAuthApp diff --git a/hostsidetests/devicepolicy/app/AccountCheck/NonTestOnlyOwner/Android.mk b/hostsidetests/devicepolicy/app/AccountCheck/NonTestOnlyOwner/Android.mk index 26e6dca09bc..7423d13385a 100644 --- a/hostsidetests/devicepolicy/app/AccountCheck/NonTestOnlyOwner/Android.mk +++ b/hostsidetests/devicepolicy/app/AccountCheck/NonTestOnlyOwner/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsAccountCheckNonTestOnlyOwnerApp diff --git a/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwner/Android.mk b/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwner/Android.mk index eeba939474b..7a8c0b73076 100644 --- a/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwner/Android.mk +++ b/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwner/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsAccountCheckTestOnlyOwnerApp diff --git a/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwnerUpdate/Android.mk b/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwnerUpdate/Android.mk index a86a98bcdb0..57f011e2a55 100644 --- a/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwnerUpdate/Android.mk +++ b/hostsidetests/devicepolicy/app/AccountCheck/TestOnlyOwnerUpdate/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsAccountCheckTestOnlyOwnerUpdateApp diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.mk b/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.mk index 80363480434..752ae96b81d 100644 --- a/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.mk +++ b/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsAccountCheckAuthAppTester diff --git a/hostsidetests/devicepolicy/app/AccountManagement/Android.mk b/hostsidetests/devicepolicy/app/AccountManagement/Android.mk index 6e70b012b39..79d1b7ee29a 100644 --- a/hostsidetests/devicepolicy/app/AccountManagement/Android.mk +++ b/hostsidetests/devicepolicy/app/AccountManagement/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsAccountManagementDevicePolicyApp diff --git a/hostsidetests/devicepolicy/app/AppRestrictionsTargetApp/Android.mk b/hostsidetests/devicepolicy/app/AppRestrictionsTargetApp/Android.mk index 9d785c55636..946a7631bed 100644 --- a/hostsidetests/devicepolicy/app/AppRestrictionsTargetApp/Android.mk +++ b/hostsidetests/devicepolicy/app/AppRestrictionsTargetApp/Android.mk @@ -27,6 +27,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 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) diff --git a/hostsidetests/devicepolicy/app/AutofillApp/Android.mk b/hostsidetests/devicepolicy/app/AutofillApp/Android.mk index aa9cfa10fb9..940c4a8b207 100644 --- a/hostsidetests/devicepolicy/app/AutofillApp/Android.mk +++ b/hostsidetests/devicepolicy/app/AutofillApp/Android.mk @@ -25,13 +25,13 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsDevicePolicyAutofillApp 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) diff --git a/hostsidetests/devicepolicy/app/CertInstaller/Android.mk b/hostsidetests/devicepolicy/app/CertInstaller/Android.mk index 90c1657f1cc..fa84415c378 100644 --- a/hostsidetests/devicepolicy/app/CertInstaller/Android.mk +++ b/hostsidetests/devicepolicy/app/CertInstaller/Android.mk @@ -29,6 +29,6 @@ LOCAL_JAVA_LIBRARIES := android.test.runner 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) diff --git a/hostsidetests/devicepolicy/app/ContactDirectoryProvider/Android.mk b/hostsidetests/devicepolicy/app/ContactDirectoryProvider/Android.mk index ef72d61dcb7..06c1f871f4e 100644 --- a/hostsidetests/devicepolicy/app/ContactDirectoryProvider/Android.mk +++ b/hostsidetests/devicepolicy/app/ContactDirectoryProvider/Android.mk @@ -25,13 +25,13 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsContactDirectoryProvider 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) diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk index c24858d4ec4..05db43a1a6d 100644 --- a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk +++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk @@ -39,7 +39,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util LOCAL_SDK_VERSION := test_current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) @@ -64,7 +64,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util LOCAL_SDK_VERSION := test_current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_AAPT_FLAGS += --rename-manifest-package com.android.cts.comp2 \ --rename-instrumentation-target-package com.android.cts.comp2 diff --git a/hostsidetests/devicepolicy/app/CustomizationApp/Android.mk b/hostsidetests/devicepolicy/app/CustomizationApp/Android.mk index e33baab54c8..cb54cd75f77 100644 --- a/hostsidetests/devicepolicy/app/CustomizationApp/Android.mk +++ b/hostsidetests/devicepolicy/app/CustomizationApp/Android.mk @@ -16,7 +16,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsCustomizationApp diff --git a/hostsidetests/devicepolicy/app/DelegateApp/Android.mk b/hostsidetests/devicepolicy/app/DelegateApp/Android.mk index 1ff51b98100..eb4ff80a0dd 100644 --- a/hostsidetests/devicepolicy/app/DelegateApp/Android.mk +++ b/hostsidetests/devicepolicy/app/DelegateApp/Android.mk @@ -31,6 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4 ctstestrunner android-support-t 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) diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk index 46d9cc036c6..3fe80f60fbf 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk @@ -31,6 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util 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) diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk index 9afaa7ae830..0f5758fde7e 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk @@ -31,6 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util 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) diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk index ba4543581c0..e874b8b372b 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk @@ -31,6 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util 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) diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk index 73e0e258e4d..1e4b9c7eba9 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk @@ -31,6 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util 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) diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk index 4be285b2cbc..6ee4acfe388 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk @@ -31,6 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util 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) diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk index d9a9f898533..68dc54609a9 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk @@ -31,6 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util 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) diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk index 8595a39845f..02071105556 100644 --- a/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk @@ -31,6 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util 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) diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk index 516e32edf4f..f8467c15cbf 100644 --- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk @@ -33,6 +33,6 @@ LOCAL_SDK_VERSION := test_current LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/../res # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk index 962c5f540dc..8a0d559544a 100644 --- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk @@ -33,6 +33,6 @@ LOCAL_SDK_VERSION := test_current LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/../res # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk index 1167a0828cb..d3a78d202e0 100644 --- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk @@ -33,6 +33,6 @@ LOCAL_SDK_VERSION := test_current LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/../res # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/Android.mk b/hostsidetests/devicepolicy/app/DeviceOwner/Android.mk index 4e9abd78a87..72e1b71703c 100644 --- a/hostsidetests/devicepolicy/app/DeviceOwner/Android.mk +++ b/hostsidetests/devicepolicy/app/DeviceOwner/Android.mk @@ -35,6 +35,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SDK_VERSION := test_current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/hostsidetests/devicepolicy/app/IntentReceiver/Android.mk b/hostsidetests/devicepolicy/app/IntentReceiver/Android.mk index 964c3898529..d289667e4ed 100644 --- a/hostsidetests/devicepolicy/app/IntentReceiver/Android.mk +++ b/hostsidetests/devicepolicy/app/IntentReceiver/Android.mk @@ -31,6 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 ctstestrunner 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) diff --git a/hostsidetests/devicepolicy/app/IntentSender/Android.mk b/hostsidetests/devicepolicy/app/IntentSender/Android.mk index b0abc2313bb..063e12e9a67 100644 --- a/hostsidetests/devicepolicy/app/IntentSender/Android.mk +++ b/hostsidetests/devicepolicy/app/IntentSender/Android.mk @@ -31,6 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 ctstestrunner ub-uiautomator 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) diff --git a/hostsidetests/devicepolicy/app/LauncherTests/Android.mk b/hostsidetests/devicepolicy/app/LauncherTests/Android.mk index 19fd3bd83d8..d7803807c32 100644 --- a/hostsidetests/devicepolicy/app/LauncherTests/Android.mk +++ b/hostsidetests/devicepolicy/app/LauncherTests/Android.mk @@ -31,6 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4 ctstestrunner android-support-t 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) diff --git a/hostsidetests/devicepolicy/app/LauncherTestsSupport/Android.mk b/hostsidetests/devicepolicy/app/LauncherTestsSupport/Android.mk index 9e86d13c57d..95b3e272241 100644 --- a/hostsidetests/devicepolicy/app/LauncherTestsSupport/Android.mk +++ b/hostsidetests/devicepolicy/app/LauncherTestsSupport/Android.mk @@ -29,6 +29,6 @@ LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit 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) diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/Android.mk b/hostsidetests/devicepolicy/app/ManagedProfile/Android.mk index ae6282f2710..d3c7c8b1b20 100644 --- a/hostsidetests/devicepolicy/app/ManagedProfile/Android.mk +++ b/hostsidetests/devicepolicy/app/ManagedProfile/Android.mk @@ -32,6 +32,6 @@ LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4 ctstestrunner compatibility-dev LOCAL_SDK_VERSION := test_current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/hostsidetests/devicepolicy/app/NotificationSender/Android.mk b/hostsidetests/devicepolicy/app/NotificationSender/Android.mk index 67509e542a4..8b85e662c8f 100644 --- a/hostsidetests/devicepolicy/app/NotificationSender/Android.mk +++ b/hostsidetests/devicepolicy/app/NotificationSender/Android.mk @@ -25,13 +25,13 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsNotificationSenderApp 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) diff --git a/hostsidetests/devicepolicy/app/PackageInstaller/Android.mk b/hostsidetests/devicepolicy/app/PackageInstaller/Android.mk index 3c0a2a1db4f..d1b2848f022 100644 --- a/hostsidetests/devicepolicy/app/PackageInstaller/Android.mk +++ b/hostsidetests/devicepolicy/app/PackageInstaller/Android.mk @@ -31,6 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 ctstestrunner ub-uiautomator LOCAL_SDK_VERSION := test_current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/hostsidetests/devicepolicy/app/ProfileOwner/Android.mk b/hostsidetests/devicepolicy/app/ProfileOwner/Android.mk index 6f9ef5d7ce3..0ffe94f9cd3 100644 --- a/hostsidetests/devicepolicy/app/ProfileOwner/Android.mk +++ b/hostsidetests/devicepolicy/app/ProfileOwner/Android.mk @@ -31,6 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util ub-uiauto LOCAL_SDK_VERSION := test_current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/hostsidetests/devicepolicy/app/SimpleApp/Android.mk b/hostsidetests/devicepolicy/app/SimpleApp/Android.mk index f7550188908..46b6292101d 100644 --- a/hostsidetests/devicepolicy/app/SimpleApp/Android.mk +++ b/hostsidetests/devicepolicy/app/SimpleApp/Android.mk @@ -25,13 +25,13 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsSimpleApp 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) diff --git a/hostsidetests/devicepolicy/app/SimplePreMApp/Android.mk b/hostsidetests/devicepolicy/app/SimplePreMApp/Android.mk index 0b7c625ac9e..649c3ab5a20 100644 --- a/hostsidetests/devicepolicy/app/SimplePreMApp/Android.mk +++ b/hostsidetests/devicepolicy/app/SimplePreMApp/Android.mk @@ -31,6 +31,6 @@ LOCAL_PACKAGE_NAME := CtsSimplePreMApp LOCAL_SDK_VERSION := 21 # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/hostsidetests/devicepolicy/app/VpnApp/Android.mk b/hostsidetests/devicepolicy/app/VpnApp/Android.mk index 8963230220b..9723b97346f 100644 --- a/hostsidetests/devicepolicy/app/VpnApp/Android.mk +++ b/hostsidetests/devicepolicy/app/VpnApp/Android.mk @@ -29,6 +29,6 @@ LOCAL_JAVA_LIBRARIES := android.test.runner 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) diff --git a/hostsidetests/devicepolicy/app/WidgetProvider/Android.mk b/hostsidetests/devicepolicy/app/WidgetProvider/Android.mk index 5e5db1e0f8c..ac967a35f42 100644 --- a/hostsidetests/devicepolicy/app/WidgetProvider/Android.mk +++ b/hostsidetests/devicepolicy/app/WidgetProvider/Android.mk @@ -27,6 +27,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 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) diff --git a/hostsidetests/devicepolicy/app/WifiConfigCreator/Android.mk b/hostsidetests/devicepolicy/app/WifiConfigCreator/Android.mk index 699b476cf96..8992f42af90 100644 --- a/hostsidetests/devicepolicy/app/WifiConfigCreator/Android.mk +++ b/hostsidetests/devicepolicy/app/WifiConfigCreator/Android.mk @@ -31,6 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util 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) diff --git a/hostsidetests/dumpsys/Android.mk b/hostsidetests/dumpsys/Android.mk index 8a3470f7957..1b3768c5b7b 100644 --- a/hostsidetests/dumpsys/Android.mk +++ b/hostsidetests/dumpsys/Android.mk @@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed LOCAL_CTS_TEST_PACKAGE := android.dumpsys # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.mk b/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.mk index b11a57bfb40..a20895df44f 100644 --- a/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.mk +++ b/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.mk @@ -26,6 +26,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_PACKAGE_NAME := CtsFramestatsTestApp # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_SUPPORT_PACKAGE) diff --git a/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.mk b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.mk index dc9e4c9941a..f438d830671 100644 --- a/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.mk +++ b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.mk @@ -34,6 +34,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SDK_VERSION := test_current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.mk b/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.mk index 169110366c9..eff16cf0e6d 100644 --- a/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.mk +++ b/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.mk @@ -34,6 +34,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SDK_VERSION := test_current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/hostsidetests/incident/Android.mk b/hostsidetests/incident/Android.mk index b02fc195a06..05a63534ace 100644 --- a/hostsidetests/incident/Android.mk +++ b/hostsidetests/incident/Android.mk @@ -20,7 +20,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) # tag this module as a cts test artifact LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE := CtsIncidentHostTestCases diff --git a/hostsidetests/incident/apps/batterystatsapp/Android.mk b/hostsidetests/incident/apps/batterystatsapp/Android.mk index 78f710bbfa0..bf1858c6a2c 100644 --- a/hostsidetests/incident/apps/batterystatsapp/Android.mk +++ b/hostsidetests/incident/apps/batterystatsapp/Android.mk @@ -34,6 +34,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SDK_VERSION := test_current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/hostsidetests/incident/apps/boundwidgetapp/Android.mk b/hostsidetests/incident/apps/boundwidgetapp/Android.mk index e9c1555dfc3..160f5d0aa32 100644 --- a/hostsidetests/incident/apps/boundwidgetapp/Android.mk +++ b/hostsidetests/incident/apps/boundwidgetapp/Android.mk @@ -34,6 +34,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SDK_VERSION := test_current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/hostsidetests/incident/apps/errorsapp/Android.mk b/hostsidetests/incident/apps/errorsapp/Android.mk index d6db6f7a9f2..87b9857d7a3 100644 --- a/hostsidetests/incident/apps/errorsapp/Android.mk +++ b/hostsidetests/incident/apps/errorsapp/Android.mk @@ -39,7 +39,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SDK_VERSION := test_current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/hostsidetests/incident/apps/graphicsstatsapp/Android.mk b/hostsidetests/incident/apps/graphicsstatsapp/Android.mk index a32926b0b43..ce3ea117635 100644 --- a/hostsidetests/incident/apps/graphicsstatsapp/Android.mk +++ b/hostsidetests/incident/apps/graphicsstatsapp/Android.mk @@ -34,6 +34,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SDK_VERSION := test_current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE)
\ No newline at end of file diff --git a/hostsidetests/incident/apps/netstatsapp/Android.mk b/hostsidetests/incident/apps/netstatsapp/Android.mk index 682ec730d10..88ae35c467d 100644 --- a/hostsidetests/incident/apps/netstatsapp/Android.mk +++ b/hostsidetests/incident/apps/netstatsapp/Android.mk @@ -34,6 +34,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SDK_VERSION := test_current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/hostsidetests/incident/apps/storagedapp/Android.mk b/hostsidetests/incident/apps/storagedapp/Android.mk index b081410d6bf..69d597e33ce 100644 --- a/hostsidetests/incident/apps/storagedapp/Android.mk +++ b/hostsidetests/incident/apps/storagedapp/Android.mk @@ -34,6 +34,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SDK_VERSION := test_current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/hostsidetests/inputmethodservice/common/Android.mk b/hostsidetests/inputmethodservice/common/Android.mk index 83bc34d8d1b..67b8f9de735 100644 --- a/hostsidetests/inputmethodservice/common/Android.mk +++ b/hostsidetests/inputmethodservice/common/Android.mk @@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES := junit LOCAL_MODULE_TAGS := tests # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE := CtsInputMethodServiceCommon diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/Android.mk b/hostsidetests/inputmethodservice/deviceside/devicetest/Android.mk index d4786bc035f..1986e5af41b 100644 --- a/hostsidetests/inputmethodservice/deviceside/devicetest/Android.mk +++ b/hostsidetests/inputmethodservice/deviceside/devicetest/Android.mk @@ -36,7 +36,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ CtsInputMethodServiceLib # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsInputMethodServiceDeviceTests diff --git a/hostsidetests/inputmethodservice/deviceside/ime1/Android.mk b/hostsidetests/inputmethodservice/deviceside/ime1/Android.mk index fe67791f161..c573ea43542 100644 --- a/hostsidetests/inputmethodservice/deviceside/ime1/Android.mk +++ b/hostsidetests/inputmethodservice/deviceside/ime1/Android.mk @@ -32,7 +32,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ CtsInputMethodServiceLib # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsInputMethod1 diff --git a/hostsidetests/inputmethodservice/deviceside/ime2/Android.mk b/hostsidetests/inputmethodservice/deviceside/ime2/Android.mk index cf9cb37b6ac..dbbb460bfe5 100644 --- a/hostsidetests/inputmethodservice/deviceside/ime2/Android.mk +++ b/hostsidetests/inputmethodservice/deviceside/ime2/Android.mk @@ -32,7 +32,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ CtsInputMethodServiceLib # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsInputMethod2 diff --git a/hostsidetests/inputmethodservice/deviceside/lib/Android.mk b/hostsidetests/inputmethodservice/deviceside/lib/Android.mk index 0223d0da555..d9d4724def7 100644 --- a/hostsidetests/inputmethodservice/deviceside/lib/Android.mk +++ b/hostsidetests/inputmethodservice/deviceside/lib/Android.mk @@ -24,7 +24,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_MODULE_TAGS := tests # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE := CtsInputMethodServiceLib diff --git a/hostsidetests/inputmethodservice/deviceside/provider/Android.mk b/hostsidetests/inputmethodservice/deviceside/provider/Android.mk index 03b39461d50..61a75742c06 100644 --- a/hostsidetests/inputmethodservice/deviceside/provider/Android.mk +++ b/hostsidetests/inputmethodservice/deviceside/provider/Android.mk @@ -31,7 +31,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ CtsInputMethodServiceLib # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsInputMethodServiceEventProvider diff --git a/hostsidetests/inputmethodservice/hostside/Android.mk b/hostsidetests/inputmethodservice/hostside/Android.mk index 19478f17470..68b4498c82d 100644 --- a/hostsidetests/inputmethodservice/hostside/Android.mk +++ b/hostsidetests/inputmethodservice/hostside/Android.mk @@ -21,7 +21,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE_TAGS := tests # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE := CtsInputMethodServiceHostTestCases diff --git a/hostsidetests/jdwpsecurity/Android.mk b/hostsidetests/jdwpsecurity/Android.mk index 3c8ead84183..c57559b4f90 100644 --- a/hostsidetests/jdwpsecurity/Android.mk +++ b/hostsidetests/jdwpsecurity/Android.mk @@ -26,7 +26,7 @@ LOCAL_MODULE := CtsJdwpSecurityHostTestCases LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.host.jdwpsecurity diff --git a/hostsidetests/jdwpsecurity/app/Android.mk b/hostsidetests/jdwpsecurity/app/Android.mk index 22f236acc1f..eae6088fbeb 100644 --- a/hostsidetests/jdwpsecurity/app/Android.mk +++ b/hostsidetests/jdwpsecurity/app/Android.mk @@ -19,5 +19,5 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := CtsJdwpApp LOCAL_SRC_FILES := $(call all-subdir-java-files) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/allocation-tracking/Android.mk b/hostsidetests/jvmti/allocation-tracking/Android.mk index c5619ad7513..511f543ac3b 100644 --- a/hostsidetests/jvmti/allocation-tracking/Android.mk +++ b/hostsidetests/jvmti/allocation-tracking/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiTrackingHostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/allocation-tracking/app/Android.mk b/hostsidetests/jvmti/allocation-tracking/app/Android.mk index 71ab1b52ea3..7b40a4f9990 100644 --- a/hostsidetests/jvmti/allocation-tracking/app/Android.mk +++ b/hostsidetests/jvmti/allocation-tracking/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/redefining/Android.mk b/hostsidetests/jvmti/redefining/Android.mk index d0a728df884..4c8ac155579 100644 --- a/hostsidetests/jvmti/redefining/Android.mk +++ b/hostsidetests/jvmti/redefining/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRedefineClassesHostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/redefining/app/Android.mk b/hostsidetests/jvmti/redefining/app/Android.mk index 704f464a35b..8ade23d3229 100644 --- a/hostsidetests/jvmti/redefining/app/Android.mk +++ b/hostsidetests/jvmti/redefining/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-902/Android.mk b/hostsidetests/jvmti/run-tests/test-902/Android.mk index 7479ad8a652..f16dd85809f 100644 --- a/hostsidetests/jvmti/run-tests/test-902/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-902/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest902HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-902/app/Android.mk b/hostsidetests/jvmti/run-tests/test-902/app/Android.mk index 3fd9dc9776a..7c9001bdddf 100644 --- a/hostsidetests/jvmti/run-tests/test-902/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-902/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-903/Android.mk b/hostsidetests/jvmti/run-tests/test-903/Android.mk index 1b67da16d45..b7d15bd63f1 100644 --- a/hostsidetests/jvmti/run-tests/test-903/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-903/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest903HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-903/app/Android.mk b/hostsidetests/jvmti/run-tests/test-903/app/Android.mk index a5011861c19..c523dce5413 100644 --- a/hostsidetests/jvmti/run-tests/test-903/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-903/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-904/Android.mk b/hostsidetests/jvmti/run-tests/test-904/Android.mk index b814acbcaab..3655374d3f8 100644 --- a/hostsidetests/jvmti/run-tests/test-904/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-904/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest904HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-904/app/Android.mk b/hostsidetests/jvmti/run-tests/test-904/app/Android.mk index 83f0efc4e5e..e248dab014b 100644 --- a/hostsidetests/jvmti/run-tests/test-904/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-904/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-905/Android.mk b/hostsidetests/jvmti/run-tests/test-905/Android.mk index 9e58b9b46c5..065585e20ae 100644 --- a/hostsidetests/jvmti/run-tests/test-905/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-905/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest905HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-905/app/Android.mk b/hostsidetests/jvmti/run-tests/test-905/app/Android.mk index 662ea5faa5d..12472e16531 100644 --- a/hostsidetests/jvmti/run-tests/test-905/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-905/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-906/Android.mk b/hostsidetests/jvmti/run-tests/test-906/Android.mk index 553b898fbf2..5a61e0f8e63 100644 --- a/hostsidetests/jvmti/run-tests/test-906/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-906/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest906HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-906/app/Android.mk b/hostsidetests/jvmti/run-tests/test-906/app/Android.mk index f3830079dc6..783ec2017f9 100644 --- a/hostsidetests/jvmti/run-tests/test-906/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-906/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-907/Android.mk b/hostsidetests/jvmti/run-tests/test-907/Android.mk index cf79d0b0c21..5629150cee7 100644 --- a/hostsidetests/jvmti/run-tests/test-907/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-907/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest907HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-907/app/Android.mk b/hostsidetests/jvmti/run-tests/test-907/app/Android.mk index 3ecb2198bb7..9ecfdd5afe6 100644 --- a/hostsidetests/jvmti/run-tests/test-907/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-907/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-908/Android.mk b/hostsidetests/jvmti/run-tests/test-908/Android.mk index 40ef837a75a..f260e262c89 100644 --- a/hostsidetests/jvmti/run-tests/test-908/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-908/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest908HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-908/app/Android.mk b/hostsidetests/jvmti/run-tests/test-908/app/Android.mk index c4eea2eac82..8cbf7db97e7 100644 --- a/hostsidetests/jvmti/run-tests/test-908/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-908/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-910/Android.mk b/hostsidetests/jvmti/run-tests/test-910/Android.mk index 8cfe0a55906..bc067909ac2 100644 --- a/hostsidetests/jvmti/run-tests/test-910/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-910/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest910HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-910/app/Android.mk b/hostsidetests/jvmti/run-tests/test-910/app/Android.mk index 108682ac05d..acb818069bb 100644 --- a/hostsidetests/jvmti/run-tests/test-910/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-910/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-913/Android.mk b/hostsidetests/jvmti/run-tests/test-913/Android.mk index 8075fe22959..d9cdd014b53 100644 --- a/hostsidetests/jvmti/run-tests/test-913/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-913/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest913HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-913/app/Android.mk b/hostsidetests/jvmti/run-tests/test-913/app/Android.mk index 03cb3281183..95b6bce6f89 100644 --- a/hostsidetests/jvmti/run-tests/test-913/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-913/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-914/Android.mk b/hostsidetests/jvmti/run-tests/test-914/Android.mk index 5f7ddee75ef..e28f495da35 100644 --- a/hostsidetests/jvmti/run-tests/test-914/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-914/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest914HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-914/app/Android.mk b/hostsidetests/jvmti/run-tests/test-914/app/Android.mk index c294d56828f..3146e3a2a1d 100644 --- a/hostsidetests/jvmti/run-tests/test-914/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-914/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-915/Android.mk b/hostsidetests/jvmti/run-tests/test-915/Android.mk index 2e2e438d60f..7934916f0e6 100644 --- a/hostsidetests/jvmti/run-tests/test-915/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-915/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest915HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-915/app/Android.mk b/hostsidetests/jvmti/run-tests/test-915/app/Android.mk index d712a746a46..4a52e4c15f3 100644 --- a/hostsidetests/jvmti/run-tests/test-915/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-915/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-917/Android.mk b/hostsidetests/jvmti/run-tests/test-917/Android.mk index 1e846751447..80199f7ca80 100644 --- a/hostsidetests/jvmti/run-tests/test-917/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-917/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest917HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-917/app/Android.mk b/hostsidetests/jvmti/run-tests/test-917/app/Android.mk index 8b870820eeb..83a6d38287f 100644 --- a/hostsidetests/jvmti/run-tests/test-917/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-917/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-918/Android.mk b/hostsidetests/jvmti/run-tests/test-918/Android.mk index 5d6f8d0ffe6..5600ece30f6 100644 --- a/hostsidetests/jvmti/run-tests/test-918/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-918/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest918HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-918/app/Android.mk b/hostsidetests/jvmti/run-tests/test-918/app/Android.mk index 30f9597d2f2..fd9f80f0c78 100644 --- a/hostsidetests/jvmti/run-tests/test-918/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-918/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-919/Android.mk b/hostsidetests/jvmti/run-tests/test-919/Android.mk index 8916d6e5e1c..76ad7db39c1 100644 --- a/hostsidetests/jvmti/run-tests/test-919/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-919/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest919HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-919/app/Android.mk b/hostsidetests/jvmti/run-tests/test-919/app/Android.mk index a9b708998a1..f333322220b 100644 --- a/hostsidetests/jvmti/run-tests/test-919/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-919/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-920/Android.mk b/hostsidetests/jvmti/run-tests/test-920/Android.mk index f92ed94fbc2..678ded5586c 100644 --- a/hostsidetests/jvmti/run-tests/test-920/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-920/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest920HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-920/app/Android.mk b/hostsidetests/jvmti/run-tests/test-920/app/Android.mk index a24d668bda5..740c4103ef5 100644 --- a/hostsidetests/jvmti/run-tests/test-920/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-920/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-922/Android.mk b/hostsidetests/jvmti/run-tests/test-922/Android.mk index 2de665a3565..aab0515b8f3 100644 --- a/hostsidetests/jvmti/run-tests/test-922/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-922/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest922HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-922/app/Android.mk b/hostsidetests/jvmti/run-tests/test-922/app/Android.mk index ada0edcaf07..dc696938e36 100644 --- a/hostsidetests/jvmti/run-tests/test-922/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-922/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-923/Android.mk b/hostsidetests/jvmti/run-tests/test-923/Android.mk index dd1de3c7926..6bac1526d1d 100644 --- a/hostsidetests/jvmti/run-tests/test-923/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-923/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest923HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-923/app/Android.mk b/hostsidetests/jvmti/run-tests/test-923/app/Android.mk index c94d431fa1a..6284f7df808 100644 --- a/hostsidetests/jvmti/run-tests/test-923/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-923/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-924/Android.mk b/hostsidetests/jvmti/run-tests/test-924/Android.mk index 28c4b89591d..c16350b9ab4 100644 --- a/hostsidetests/jvmti/run-tests/test-924/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-924/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest924HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-924/app/Android.mk b/hostsidetests/jvmti/run-tests/test-924/app/Android.mk index f1acfd06049..18e4f72c838 100644 --- a/hostsidetests/jvmti/run-tests/test-924/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-924/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-926/Android.mk b/hostsidetests/jvmti/run-tests/test-926/Android.mk index fcd46adc371..3ea1d85f927 100644 --- a/hostsidetests/jvmti/run-tests/test-926/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-926/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest926HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-926/app/Android.mk b/hostsidetests/jvmti/run-tests/test-926/app/Android.mk index a597fb16b40..34360296095 100644 --- a/hostsidetests/jvmti/run-tests/test-926/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-926/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-927/Android.mk b/hostsidetests/jvmti/run-tests/test-927/Android.mk index 939601c44bc..98d5f2e70a7 100644 --- a/hostsidetests/jvmti/run-tests/test-927/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-927/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest927HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-927/app/Android.mk b/hostsidetests/jvmti/run-tests/test-927/app/Android.mk index 9c71950aa2d..1e8fdb366ec 100644 --- a/hostsidetests/jvmti/run-tests/test-927/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-927/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-928/Android.mk b/hostsidetests/jvmti/run-tests/test-928/Android.mk index 2eac8f963bf..6084806bfbf 100644 --- a/hostsidetests/jvmti/run-tests/test-928/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-928/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest928HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-928/app/Android.mk b/hostsidetests/jvmti/run-tests/test-928/app/Android.mk index 2eb36121b69..fa3537fced0 100644 --- a/hostsidetests/jvmti/run-tests/test-928/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-928/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-930/Android.mk b/hostsidetests/jvmti/run-tests/test-930/Android.mk index 2ac9ae2491a..10a3d1853fe 100644 --- a/hostsidetests/jvmti/run-tests/test-930/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-930/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest930HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-930/app/Android.mk b/hostsidetests/jvmti/run-tests/test-930/app/Android.mk index 873b273db70..6affa06230e 100644 --- a/hostsidetests/jvmti/run-tests/test-930/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-930/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-931/Android.mk b/hostsidetests/jvmti/run-tests/test-931/Android.mk index ae043871865..063c6f5476d 100644 --- a/hostsidetests/jvmti/run-tests/test-931/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-931/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest931HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-931/app/Android.mk b/hostsidetests/jvmti/run-tests/test-931/app/Android.mk index c03028a440f..52eed7670e0 100644 --- a/hostsidetests/jvmti/run-tests/test-931/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-931/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-932/Android.mk b/hostsidetests/jvmti/run-tests/test-932/Android.mk index c952c8682c2..198adaec25d 100644 --- a/hostsidetests/jvmti/run-tests/test-932/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-932/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest932HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-932/app/Android.mk b/hostsidetests/jvmti/run-tests/test-932/app/Android.mk index 651a9ee8f57..e0c96d3b8ea 100644 --- a/hostsidetests/jvmti/run-tests/test-932/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-932/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-940/Android.mk b/hostsidetests/jvmti/run-tests/test-940/Android.mk index 4ed5dec7ad3..453dee0fa3b 100644 --- a/hostsidetests/jvmti/run-tests/test-940/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-940/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest940HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-940/app/Android.mk b/hostsidetests/jvmti/run-tests/test-940/app/Android.mk index c2121ebdf4b..0ba569cd5b5 100644 --- a/hostsidetests/jvmti/run-tests/test-940/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-940/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-942/Android.mk b/hostsidetests/jvmti/run-tests/test-942/Android.mk index d2605b705ab..8a6657f9db7 100644 --- a/hostsidetests/jvmti/run-tests/test-942/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-942/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest942HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-942/app/Android.mk b/hostsidetests/jvmti/run-tests/test-942/app/Android.mk index 82d3b6a5b09..a29d4b69051 100644 --- a/hostsidetests/jvmti/run-tests/test-942/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-942/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-944/Android.mk b/hostsidetests/jvmti/run-tests/test-944/Android.mk index 16f9c7f2125..b90c3e3eb4a 100644 --- a/hostsidetests/jvmti/run-tests/test-944/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-944/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest944HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-944/app/Android.mk b/hostsidetests/jvmti/run-tests/test-944/app/Android.mk index c82028429c9..d564fc51920 100644 --- a/hostsidetests/jvmti/run-tests/test-944/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-944/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-945/Android.mk b/hostsidetests/jvmti/run-tests/test-945/Android.mk index e86d85e6b68..754d7ca75d9 100644 --- a/hostsidetests/jvmti/run-tests/test-945/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-945/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest945HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-945/app/Android.mk b/hostsidetests/jvmti/run-tests/test-945/app/Android.mk index b704807aeb8..b1a8290f5a2 100644 --- a/hostsidetests/jvmti/run-tests/test-945/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-945/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-947/Android.mk b/hostsidetests/jvmti/run-tests/test-947/Android.mk index 4b4ceadc59a..6a612e260d9 100644 --- a/hostsidetests/jvmti/run-tests/test-947/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-947/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest947HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-947/app/Android.mk b/hostsidetests/jvmti/run-tests/test-947/app/Android.mk index 42cc459763f..5d315e8d6a3 100644 --- a/hostsidetests/jvmti/run-tests/test-947/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-947/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-951/Android.mk b/hostsidetests/jvmti/run-tests/test-951/Android.mk index ba45b867214..5a6d494b7b1 100644 --- a/hostsidetests/jvmti/run-tests/test-951/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-951/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest951HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-951/app/Android.mk b/hostsidetests/jvmti/run-tests/test-951/app/Android.mk index 6b222749a9f..273bec3e15a 100644 --- a/hostsidetests/jvmti/run-tests/test-951/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-951/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-981/Android.mk b/hostsidetests/jvmti/run-tests/test-981/Android.mk index 4bbc20ac575..151379b1bd3 100644 --- a/hostsidetests/jvmti/run-tests/test-981/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-981/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest981HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-981/app/Android.mk b/hostsidetests/jvmti/run-tests/test-981/app/Android.mk index ec8f7aa0a3c..88727c21a75 100644 --- a/hostsidetests/jvmti/run-tests/test-981/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-981/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-982/Android.mk b/hostsidetests/jvmti/run-tests/test-982/Android.mk index 908adaf6a69..154bc70c358 100644 --- a/hostsidetests/jvmti/run-tests/test-982/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-982/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest982HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-982/app/Android.mk b/hostsidetests/jvmti/run-tests/test-982/app/Android.mk index a06c76d6686..c6099b3f8c2 100644 --- a/hostsidetests/jvmti/run-tests/test-982/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-982/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/run-tests/test-984/Android.mk b/hostsidetests/jvmti/run-tests/test-984/Android.mk index 3ddb2ad825d..1ff5f2e4cf1 100644 --- a/hostsidetests/jvmti/run-tests/test-984/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-984/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiRunTest984HostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/run-tests/test-984/app/Android.mk b/hostsidetests/jvmti/run-tests/test-984/app/Android.mk index b30ff35bb61..0a3c5efdcf6 100644 --- a/hostsidetests/jvmti/run-tests/test-984/app/Android.mk +++ b/hostsidetests/jvmti/run-tests/test-984/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceRunTestAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/jvmti/tagging/Android.mk b/hostsidetests/jvmti/tagging/Android.mk index 61e06a4e558..b5674cbe334 100644 --- a/hostsidetests/jvmti/tagging/Android.mk +++ b/hostsidetests/jvmti/tagging/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := CtsJvmtiTaggingHostTestCases LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiHostTestBase LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/jvmti/tagging/app/Android.mk b/hostsidetests/jvmti/tagging/app/Android.mk index 343dc32daed..3cd89c1412f 100644 --- a/hostsidetests/jvmti/tagging/app/Android.mk +++ b/hostsidetests/jvmti/tagging/app/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsJvmtiDeviceAppBase LOCAL_JNI_SHARED_LIBRARIES := libctsjvmtiagent LOCAL_MULTILIB := both diff --git a/hostsidetests/monkey/Android.mk b/hostsidetests/monkey/Android.mk index 7c7ecb59b43..34305e82cb4 100644 --- a/hostsidetests/monkey/Android.mk +++ b/hostsidetests/monkey/Android.mk @@ -28,7 +28,7 @@ LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util LOCAL_CTS_TEST_PACKAGE := zzz.android.monkey # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/monkey/test-apps/CtsMonkeyApp/Android.mk b/hostsidetests/monkey/test-apps/CtsMonkeyApp/Android.mk index 573b4888abe..56b27f0d660 100644 --- a/hostsidetests/monkey/test-apps/CtsMonkeyApp/Android.mk +++ b/hostsidetests/monkey/test-apps/CtsMonkeyApp/Android.mk @@ -31,6 +31,6 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) 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) diff --git a/hostsidetests/monkey/test-apps/CtsMonkeyApp2/Android.mk b/hostsidetests/monkey/test-apps/CtsMonkeyApp2/Android.mk index 22c8bf30c9e..1cf9256cfb5 100644 --- a/hostsidetests/monkey/test-apps/CtsMonkeyApp2/Android.mk +++ b/hostsidetests/monkey/test-apps/CtsMonkeyApp2/Android.mk @@ -31,6 +31,6 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) 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) diff --git a/hostsidetests/multiuser/Android.mk b/hostsidetests/multiuser/Android.mk index ec1891218f4..a043b55758d 100644 --- a/hostsidetests/multiuser/Android.mk +++ b/hostsidetests/multiuser/Android.mk @@ -27,7 +27,7 @@ LOCAL_JAVA_LIBRARIES := tools-common-prebuilt cts-tradefed tradefed LOCAL_CTS_TEST_PACKAGE := android.host.multiuser # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/net/Android.mk b/hostsidetests/net/Android.mk index 1c3f0536c4d..88fbe0c7732 100644 --- a/hostsidetests/net/Android.mk +++ b/hostsidetests/net/Android.mk @@ -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) diff --git a/hostsidetests/net/app/Android.mk b/hostsidetests/net/app/Android.mk index 1c1a798fabd..5e8c2b628b0 100644 --- a/hostsidetests/net/app/Android.mk +++ b/hostsidetests/net/app/Android.mk @@ -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) diff --git a/hostsidetests/net/app2/Android.mk b/hostsidetests/net/app2/Android.mk index 706455d5636..02071bfc862 100644 --- a/hostsidetests/net/app2/Android.mk +++ b/hostsidetests/net/app2/Android.mk @@ -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) diff --git a/hostsidetests/numberblocking/Android.mk b/hostsidetests/numberblocking/Android.mk index 42c71693def..1aac30f5e7e 100644 --- a/hostsidetests/numberblocking/Android.mk +++ b/hostsidetests/numberblocking/Android.mk @@ -21,7 +21,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE_TAGS := tests # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE := CtsHostsideNumberBlockingTestCases diff --git a/hostsidetests/numberblocking/app/Android.mk b/hostsidetests/numberblocking/app/Android.mk index 5755f84ffe9..5c7e97e2370 100644 --- a/hostsidetests/numberblocking/app/Android.mk +++ b/hostsidetests/numberblocking/app/Android.mk @@ -30,7 +30,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner android-support-test # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsHostsideNumberBlockingAppTest diff --git a/hostsidetests/os/Android.mk b/hostsidetests/os/Android.mk index e54703e01e5..3b8a1cf1b29 100644 --- a/hostsidetests/os/Android.mk +++ b/hostsidetests/os/Android.mk @@ -28,7 +28,7 @@ LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util LOCAL_CTS_TEST_PACKAGE := android.host.os # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/os/app/Android.mk b/hostsidetests/os/app/Android.mk index 86c109e5b4b..1897198566a 100644 --- a/hostsidetests/os/app/Android.mk +++ b/hostsidetests/os/app/Android.mk @@ -24,7 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsDeviceOsTestApp diff --git a/hostsidetests/os/test-apps/Android.mk b/hostsidetests/os/test-apps/Android.mk index 4afd486f7b5..9fadf37913d 100644 --- a/hostsidetests/os/test-apps/Android.mk +++ b/hostsidetests/os/test-apps/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # Build the test APKs using their own makefiles include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/hostsidetests/os/test-apps/HostLinkVerificationApp/Android.mk b/hostsidetests/os/test-apps/HostLinkVerificationApp/Android.mk index 7ab04339262..cfe131cc403 100644 --- a/hostsidetests/os/test-apps/HostLinkVerificationApp/Android.mk +++ b/hostsidetests/os/test-apps/HostLinkVerificationApp/Android.mk @@ -24,6 +24,6 @@ LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := CtsHostLinkVerificationApp # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_SUPPORT_PACKAGE) diff --git a/hostsidetests/os/test-apps/ProcfsTestApp/Android.mk b/hostsidetests/os/test-apps/ProcfsTestApp/Android.mk index f7b98c37493..a1688457e60 100644 --- a/hostsidetests/os/test-apps/ProcfsTestApp/Android.mk +++ b/hostsidetests/os/test-apps/ProcfsTestApp/Android.mk @@ -26,6 +26,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsHostProcfsTestApp # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_SUPPORT_PACKAGE) diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.mk index f23f79f8fa8..c673e71eda7 100644 --- a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.mk +++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.mk @@ -28,6 +28,6 @@ LOCAL_RES_LIBRARIES := CtsStaticSharedLibProviderApp1 LOCAL_PACKAGE_NAME := CtsStaticSharedLibConsumerApp1 -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_SUPPORT_PACKAGE) diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/Android.mk index 9c2efaf526c..8ce6c9a66c8 100644 --- a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/Android.mk +++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/Android.mk @@ -27,6 +27,6 @@ LOCAL_RES_LIBRARIES := CtsStaticSharedLibProviderApp4 LOCAL_PACKAGE_NAME := CtsStaticSharedLibConsumerApp2 -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_SUPPORT_PACKAGE) diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/Android.mk index 74f207a138f..8c63b2e1a0a 100644 --- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/Android.mk +++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/Android.mk @@ -26,7 +26,7 @@ LOCAL_PACKAGE_NAME := CtsStaticSharedLibProviderApp1 LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PROGUARD_ENABLED := disabled diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/Android.mk index 41d1eec3f72..bd7a27e4cdc 100644 --- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/Android.mk +++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/Android.mk @@ -26,7 +26,7 @@ LOCAL_PACKAGE_NAME := CtsStaticSharedLibProviderApp2 LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_AAPT_FLAGS := --shared-lib diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/Android.mk index 0be004938e6..04b794c722d 100644 --- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/Android.mk +++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/Android.mk @@ -23,7 +23,7 @@ LOCAL_PACKAGE_NAME := CtsStaticSharedLibProviderApp3 LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_AAPT_FLAGS := --shared-lib diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/Android.mk index e5becb5c499..b4c524864a8 100644 --- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/Android.mk +++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/Android.mk @@ -25,7 +25,7 @@ LOCAL_PACKAGE_NAME := CtsStaticSharedLibProviderApp4 LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PROGUARD_ENABLED := disabled diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/Android.mk index bfe894a53ce..99acb17c2a4 100644 --- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/Android.mk +++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/Android.mk @@ -26,7 +26,7 @@ LOCAL_PACKAGE_NAME := CtsStaticSharedLibProviderApp5 LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_AAPT_FLAGS := --shared-lib diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/Android.mk index 335cce96436..ef92c71b991 100644 --- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/Android.mk +++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/Android.mk @@ -26,7 +26,7 @@ LOCAL_PACKAGE_NAME := CtsStaticSharedLibProviderApp6 LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_AAPT_FLAGS := --shared-lib diff --git a/hostsidetests/sample/Android.mk b/hostsidetests/sample/Android.mk index bfdaedaf712..427d72ace88 100644 --- a/hostsidetests/sample/Android.mk +++ b/hostsidetests/sample/Android.mk @@ -21,7 +21,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE_TAGS := tests # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE := CtsSampleHostTestCases diff --git a/hostsidetests/sample/app/Android.mk b/hostsidetests/sample/app/Android.mk index 7e7cd91c6cd..c69f29f0e6a 100644 --- a/hostsidetests/sample/app/Android.mk +++ b/hostsidetests/sample/app/Android.mk @@ -28,7 +28,7 @@ LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := $(call all-java-files-under, src) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsSampleDeviceApp diff --git a/hostsidetests/sample/app2/Android.mk b/hostsidetests/sample/app2/Android.mk index 0900f1f199f..4c20ae32ae7 100644 --- a/hostsidetests/sample/app2/Android.mk +++ b/hostsidetests/sample/app2/Android.mk @@ -30,7 +30,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_SRC_FILES := $(call all-java-files-under, src) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsSampleDeviceApp2 diff --git a/hostsidetests/security/Android.mk b/hostsidetests/security/Android.mk index ffb5addecf0..5544dc64da3 100644 --- a/hostsidetests/security/Android.mk +++ b/hostsidetests/security/Android.mk @@ -23,7 +23,7 @@ LOCAL_JAVA_RESOURCE_DIRS := res LOCAL_MODULE_TAGS := optional # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # Must match the package name in CtsTestCaseList.mk LOCAL_MODULE := CtsSecurityHostTestCases diff --git a/hostsidetests/security/securityPatch/CVE-2016-6730/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-6730/Android.mk index 14337abe2e8..350a4feddff 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-6730/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-6730/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-6731/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-6731/Android.mk index 718dbe38d15..4e14be4bc6a 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-6731/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-6731/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-6732/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-6732/Android.mk index 03b7b871efe..7c289a48bad 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-6732/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-6732/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-6733/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-6733/Android.mk index 7b021889f97..a535f0b6141 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-6733/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-6733/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-6734/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-6734/Android.mk index e1eebbd52b8..9450db977df 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-6734/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-6734/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-6735/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-6735/Android.mk index 8935cd69c05..d089c4015be 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-6735/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-6735/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-6736/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-6736/Android.mk index fd7fc21f092..bb6efc8d0c0 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-6736/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-6736/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8412/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8412/Android.mk index bba13f3f794..197690f1e40 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8412/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8412/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8424/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8424/Android.mk index 5ff169bf145..2b33fd424be 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8424/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8424/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8425/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8425/Android.mk index e98481272ce..8b1ab648ac7 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8425/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8425/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8426/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8426/Android.mk index a134d9c60c4..c5c7521d823 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8426/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8426/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8427/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8427/Android.mk index 131f240ff62..5e4c3237283 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8427/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8427/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8428/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8428/Android.mk index 21326f9bb20..dd684363515 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8428/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8428/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8429/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8429/Android.mk index bfe871808da..438a57806f8 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8429/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8429/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8430/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8430/Android.mk index 839047b53ad..f0a0e6030e1 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8430/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8430/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8431/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8431/Android.mk index d0ef8230182..ccfbab8d7e4 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8431/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8431/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8432/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8432/Android.mk index 614d20bb367..235c3232825 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8432/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8432/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8434/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8434/Android.mk index 6b20fe4bca3..8c8cc35e80d 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8434/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8434/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8435/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8435/Android.mk index 62efb65d501..6dbedc102c2 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8435/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8435/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8444/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8444/Android.mk index 50e2f6a51da..2e667abac5f 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8444/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8444/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8448/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8448/Android.mk index cd6049f80ae..155f72ba61c 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8448/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8448/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8449/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8449/Android.mk index ce1e1bbbb2c..a905cc9882b 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8449/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8449/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8460/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8460/Android.mk index b9c51d169b7..51f8169cb98 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8460/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8460/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-8482/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-8482/Android.mk index b41fb164eb2..16ceff272af 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-8482/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-8482/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2016-9120/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-9120/Android.mk index 95ddb3d8e8f..b5d138d78b4 100644 --- a/hostsidetests/security/securityPatch/CVE-2016-9120/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2016-9120/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2017-0403/Android.mk b/hostsidetests/security/securityPatch/CVE-2017-0403/Android.mk index cb31e4d6c32..bd84becd4c6 100644 --- a/hostsidetests/security/securityPatch/CVE-2017-0403/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2017-0403/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2017-0404/Android.mk b/hostsidetests/security/securityPatch/CVE-2017-0404/Android.mk index 9e30d30604c..66978e009b9 100644 --- a/hostsidetests/security/securityPatch/CVE-2017-0404/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2017-0404/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/security/securityPatch/CVE-2017-0429/Android.mk b/hostsidetests/security/securityPatch/CVE-2017-0429/Android.mk index afb77b46e16..495a9358bdb 100644 --- a/hostsidetests/security/securityPatch/CVE-2017-0429/Android.mk +++ b/hostsidetests/security/securityPatch/CVE-2017-0429/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.security.cts LOCAL_ARM_MODE := arm diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/Android.mk b/hostsidetests/services/activityandwindowmanager/activitymanager/Android.mk index 3a5023289c9..6ca5278c09b 100644 --- a/hostsidetests/services/activityandwindowmanager/activitymanager/Android.mk +++ b/hostsidetests/services/activityandwindowmanager/activitymanager/Android.mk @@ -30,7 +30,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := cts-amwm-util \ LOCAL_CTS_TEST_PACKAGE := android.server # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/Android.mk b/hostsidetests/services/activityandwindowmanager/activitymanager/app/Android.mk index 9abafe9b1eb..0c8ee2d498f 100644 --- a/hostsidetests/services/activityandwindowmanager/activitymanager/app/Android.mk +++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/Android.mk @@ -25,7 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ LOCAL_SDK_VERSION := test_current # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsDeviceServicesTestApp diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/appDisplaySize/Android.mk b/hostsidetests/services/activityandwindowmanager/activitymanager/appDisplaySize/Android.mk index 7f7abd2bbf8..95af843c011 100644 --- a/hostsidetests/services/activityandwindowmanager/activitymanager/appDisplaySize/Android.mk +++ b/hostsidetests/services/activityandwindowmanager/activitymanager/appDisplaySize/Android.mk @@ -24,7 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := test_current # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsDeviceDisplaySizeApp diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/appSecondUid/Android.mk b/hostsidetests/services/activityandwindowmanager/activitymanager/appSecondUid/Android.mk index b591589106f..109279fd4ff 100644 --- a/hostsidetests/services/activityandwindowmanager/activitymanager/appSecondUid/Android.mk +++ b/hostsidetests/services/activityandwindowmanager/activitymanager/appSecondUid/Android.mk @@ -24,7 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := test_current # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsDeviceServicesTestSecondApp diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/appThirdUid/Android.mk b/hostsidetests/services/activityandwindowmanager/activitymanager/appThirdUid/Android.mk index 4e7166220dc..73304b4a0f1 100644 --- a/hostsidetests/services/activityandwindowmanager/activitymanager/appThirdUid/Android.mk +++ b/hostsidetests/services/activityandwindowmanager/activitymanager/appThirdUid/Android.mk @@ -24,7 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := test_current # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsDeviceServicesTestThirdApp diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/Android.mk b/hostsidetests/services/activityandwindowmanager/windowmanager/Android.mk index 79470c6475e..2ce16d8471e 100644 --- a/hostsidetests/services/activityandwindowmanager/windowmanager/Android.mk +++ b/hostsidetests/services/activityandwindowmanager/windowmanager/Android.mk @@ -30,7 +30,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_CTS_TEST_PACKAGE := android.server.cts # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowapp/Android.mk b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowapp/Android.mk index a0f71ddff24..1bdeeb43565 100644 --- a/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowapp/Android.mk +++ b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowapp/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := \ LOCAL_SDK_VERSION := test_current # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsDeviceAlertWindowTestApp diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowappsdk25/Android.mk b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowappsdk25/Android.mk index 940f7a66d65..4a4c0c7f85a 100644 --- a/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowappsdk25/Android.mk +++ b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowappsdk25/Android.mk @@ -25,7 +25,7 @@ LOCAL_SRC_FILES := \ LOCAL_SDK_VERSION := 25 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsDeviceAlertWindowTestAppSdk25 diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/Android.mk b/hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/Android.mk index 1ec751c3f78..4cd44ed45c1 100644 --- a/hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/Android.mk +++ b/hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/Android.mk @@ -24,7 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsDragAndDropSourceApp diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetapp/Android.mk b/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetapp/Android.mk index 7dc512cf5a3..10fe386885f 100644 --- a/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetapp/Android.mk +++ b/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetapp/Android.mk @@ -24,7 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := current # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsDragAndDropTargetApp diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetappsdk23/Android.mk b/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetappsdk23/Android.mk index a42f8d0634c..29072413210 100644 --- a/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetappsdk23/Android.mk +++ b/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetappsdk23/Android.mk @@ -24,7 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := 23 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsDragAndDropTargetAppSdk23 diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/Android.mk b/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/Android.mk index e5aa610562c..7719315a71a 100644 --- a/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/Android.mk +++ b/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/Android.mk @@ -24,7 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := test_current # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsDeviceWindowFramesTestApp diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk b/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk index 810fe644ea1..3871c0d77bf 100644 --- a/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk +++ b/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsShortcutBackupLauncher1 diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk b/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk index 3eb0cde15a1..65a1a28188a 100644 --- a/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk +++ b/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsShortcutBackupLauncher2 diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk b/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk index 0b072a54617..ab0b4ce40b2 100644 --- a/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk +++ b/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsShortcutBackupLauncher3 diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk index a729fe87693..179f2be392e 100644 --- a/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk +++ b/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsShortcutBackupPublisher1 diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk index 12a09956b92..6376c86d2b3 100644 --- a/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk +++ b/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsShortcutBackupPublisher2 diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk index 4232034c57c..f59093bfba9 100644 --- a/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk +++ b/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsShortcutBackupPublisher3 diff --git a/hostsidetests/shortcuts/deviceside/multiuser/Android.mk b/hostsidetests/shortcuts/deviceside/multiuser/Android.mk index 183531b6b90..f48b4ce7b0b 100644 --- a/hostsidetests/shortcuts/deviceside/multiuser/Android.mk +++ b/hostsidetests/shortcuts/deviceside/multiuser/Android.mk @@ -19,7 +19,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsShortcutMultiuserTest diff --git a/hostsidetests/shortcuts/deviceside/upgrade/Android.mk b/hostsidetests/shortcuts/deviceside/upgrade/Android.mk index 11bfc2f88a4..d9d7079d7a9 100644 --- a/hostsidetests/shortcuts/deviceside/upgrade/Android.mk +++ b/hostsidetests/shortcuts/deviceside/upgrade/Android.mk @@ -21,7 +21,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsShortcutUpgradeVersion1 @@ -52,7 +52,7 @@ include $(BUILD_CTS_PACKAGE) include $(CLEAR_VARS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsShortcutUpgradeVersion2 diff --git a/hostsidetests/shortcuts/hostside/Android.mk b/hostsidetests/shortcuts/hostside/Android.mk index 830ec94426e..6eeb0013704 100644 --- a/hostsidetests/shortcuts/hostside/Android.mk +++ b/hostsidetests/shortcuts/hostside/Android.mk @@ -27,7 +27,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := tools-common-prebuilt cts-tradefed tradefed # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/sustainedperf/Android.mk b/hostsidetests/sustainedperf/Android.mk index a9f06e404cb..3187415f8d6 100644 --- a/hostsidetests/sustainedperf/Android.mk +++ b/hostsidetests/sustainedperf/Android.mk @@ -21,7 +21,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE_TAGS := tests # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MODULE := CtsSustainedPerformanceHostTestCases LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util diff --git a/hostsidetests/sustainedperf/app/Android.mk b/hostsidetests/sustainedperf/app/Android.mk index 41f61e4ac7a..473621a6373 100644 --- a/hostsidetests/sustainedperf/app/Android.mk +++ b/hostsidetests/sustainedperf/app/Android.mk @@ -28,7 +28,7 @@ LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := $(call all-java-files-under, src) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsSustainedPerformanceDeviceTestApp diff --git a/hostsidetests/sustainedperf/dhrystone/Android.mk b/hostsidetests/sustainedperf/dhrystone/Android.mk index 4c6b53d02ba..b7a2baf9031 100644 --- a/hostsidetests/sustainedperf/dhrystone/Android.mk +++ b/hostsidetests/sustainedperf/dhrystone/Android.mk @@ -14,5 +14,5 @@ LOCAL_CFLAGS += -Wno-return-type -Wno-implicit-function-declaration -Wno-implici LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_EXECUTABLE) diff --git a/hostsidetests/sustainedperf/shadertoy_android/Android.mk b/hostsidetests/sustainedperf/shadertoy_android/Android.mk index 0c6c2a466f0..c9a5000d945 100644 --- a/hostsidetests/sustainedperf/shadertoy_android/Android.mk +++ b/hostsidetests/sustainedperf/shadertoy_android/Android.mk @@ -33,6 +33,6 @@ LOCAL_PACKAGE_NAME := CtsSustainedPerformanceTestCases LOCAL_SDK_VERSION := current # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_PACKAGE) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/hostsidetests/systemui/Android.mk b/hostsidetests/systemui/Android.mk index d4305f541d4..a2bcf05dfbc 100644 --- a/hostsidetests/systemui/Android.mk +++ b/hostsidetests/systemui/Android.mk @@ -29,7 +29,7 @@ LOCAL_CTS_TEST_PACKAGE := android.host.systemui 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_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/systemui/app/Android.mk b/hostsidetests/systemui/app/Android.mk index ca987e7889d..6e45818323f 100644 --- a/hostsidetests/systemui/app/Android.mk +++ b/hostsidetests/systemui/app/Android.mk @@ -28,7 +28,7 @@ LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := $(call all-java-files-under, src) # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsSystemUiDeviceApp diff --git a/hostsidetests/theme/Android.mk b/hostsidetests/theme/Android.mk index 7d1d18c6610..c79bd13913f 100644 --- a/hostsidetests/theme/Android.mk +++ b/hostsidetests/theme/Android.mk @@ -38,7 +38,7 @@ LOCAL_CTS_TEST_PACKAGE := android.host.theme 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_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/theme/app/Android.mk b/hostsidetests/theme/app/Android.mk index 5f6b11cad58..cb97bc0d84f 100644 --- a/hostsidetests/theme/app/Android.mk +++ b/hostsidetests/theme/app/Android.mk @@ -36,7 +36,7 @@ LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true LOCAL_PACKAGE_NAME := CtsThemeDeviceApp # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := 23 diff --git a/hostsidetests/trustedvoice/Android.mk b/hostsidetests/trustedvoice/Android.mk index d80f7250cab..a0bc98bb072 100644 --- a/hostsidetests/trustedvoice/Android.mk +++ b/hostsidetests/trustedvoice/Android.mk @@ -28,7 +28,7 @@ LOCAL_JAVA_LIBRARIES := cts-tradefed ddmlib-prebuilt tradefed LOCAL_CTS_TEST_PACKAGE := android.host.trustedvoice # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/trustedvoice/app/Android.mk b/hostsidetests/trustedvoice/app/Android.mk index 7a759d82f4f..c9140e58bbe 100644 --- a/hostsidetests/trustedvoice/app/Android.mk +++ b/hostsidetests/trustedvoice/app/Android.mk @@ -27,7 +27,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsTrustedVoiceApp # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/hostsidetests/tv/Android.mk b/hostsidetests/tv/Android.mk index cb5e2bd39e1..687252d4fe9 100644 --- a/hostsidetests/tv/Android.mk +++ b/hostsidetests/tv/Android.mk @@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util LOCAL_CTS_TEST_PACKAGE := android.tv.hostsidetv # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/tv/app/Android.mk b/hostsidetests/tv/app/Android.mk index 454d3520bed..c26a46a8797 100644 --- a/hostsidetests/tv/app/Android.mk +++ b/hostsidetests/tv/app/Android.mk @@ -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) diff --git a/hostsidetests/tv/app2/Android.mk b/hostsidetests/tv/app2/Android.mk index 166baec6490..ef34420c093 100644 --- a/hostsidetests/tv/app2/Android.mk +++ b/hostsidetests/tv/app2/Android.mk @@ -23,7 +23,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/hostsidetests/ui/Android.mk b/hostsidetests/ui/Android.mk index e2457c504a9..be29fdd30d8 100644 --- a/hostsidetests/ui/Android.mk +++ b/hostsidetests/ui/Android.mk @@ -31,7 +31,7 @@ $(COMPATIBILITY_TESTCASES_OUT_cts)/CtsUiHostTestCases.jar : $(COMPATIBILITY_TEST LOCAL_CTS_TEST_PACKAGE := android.ui.cts # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/ui/appA/Android.mk b/hostsidetests/ui/appA/Android.mk index 2d9454318ba..4699e6c0883 100644 --- a/hostsidetests/ui/appA/Android.mk +++ b/hostsidetests/ui/appA/Android.mk @@ -27,7 +27,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsDeviceTaskSwitchingAppA # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/hostsidetests/ui/appB/Android.mk b/hostsidetests/ui/appB/Android.mk index 24108ca5c33..39ef2c90e0a 100644 --- a/hostsidetests/ui/appB/Android.mk +++ b/hostsidetests/ui/appB/Android.mk @@ -27,7 +27,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsDeviceTaskSwitchingAppB # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/hostsidetests/ui/control/Android.mk b/hostsidetests/ui/control/Android.mk index fa63c59500f..771431da088 100644 --- a/hostsidetests/ui/control/Android.mk +++ b/hostsidetests/ui/control/Android.mk @@ -27,7 +27,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsDeviceTaskSwitchingControl # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/hostsidetests/usage/Android.mk b/hostsidetests/usage/Android.mk index 482ba9144c3..dd0eb86c08a 100644 --- a/hostsidetests/usage/Android.mk +++ b/hostsidetests/usage/Android.mk @@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed LOCAL_CTS_TEST_PACKAGE := android.host.app.usage # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/usage/app/Android.mk b/hostsidetests/usage/app/Android.mk index 7347b9b2d6e..0d765e79017 100644 --- a/hostsidetests/usage/app/Android.mk +++ b/hostsidetests/usage/app/Android.mk @@ -26,6 +26,6 @@ LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := CtsAppUsageTestApp # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_SUPPORT_PACKAGE) diff --git a/hostsidetests/usb/Android.mk b/hostsidetests/usb/Android.mk index bc984456a89..47b1f13775d 100644 --- a/hostsidetests/usb/Android.mk +++ b/hostsidetests/usb/Android.mk @@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util LOCAL_CTS_TEST_PACKAGE := android.usb # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/usb/SerialTestApp/Android.mk b/hostsidetests/usb/SerialTestApp/Android.mk index f71c7f44ca6..7a582fdd5f2 100644 --- a/hostsidetests/usb/SerialTestApp/Android.mk +++ b/hostsidetests/usb/SerialTestApp/Android.mk @@ -29,6 +29,6 @@ LOCAL_PACKAGE_NAME := CtsUsbSerialTestApp 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) diff --git a/hostsidetests/webkit/Android.mk b/hostsidetests/webkit/Android.mk index 6fe433c38fc..897940b9f43 100644 --- a/hostsidetests/webkit/Android.mk +++ b/hostsidetests/webkit/Android.mk @@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES := tradefed LOCAL_CTS_TEST_PACKAGE := android.webkit.hostside # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_HOST_JAVA_LIBRARY) diff --git a/hostsidetests/webkit/app/Android.mk b/hostsidetests/webkit/app/Android.mk index 6370fa43c10..28c0c0177d2 100644 --- a/hostsidetests/webkit/app/Android.mk +++ b/hostsidetests/webkit/app/Android.mk @@ -38,6 +38,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) diff --git a/tests/JobScheduler/Android.mk b/tests/JobScheduler/Android.mk index acfcbb2bd11..ae1fa4dd7ea 100755 --- a/tests/JobScheduler/Android.mk +++ b/tests/JobScheduler/Android.mk @@ -27,7 +27,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # Must match the package name in CtsTestCaseList.mk LOCAL_PACKAGE_NAME := CtsJobSchedulerTestCases diff --git a/tests/JobScheduler/jobperm/Android.mk b/tests/JobScheduler/jobperm/Android.mk index 97bfd3e2547..ca00ca7317f 100644 --- a/tests/JobScheduler/jobperm/Android.mk +++ b/tests/JobScheduler/jobperm/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under, src) \ # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsJobSchedulerJobPerm diff --git a/tests/acceleration/Android.mk b/tests/acceleration/Android.mk index e55c0dd4817..5bcd0b5fa68 100644 --- a/tests/acceleration/Android.mk +++ b/tests/acceleration/Android.mk @@ -29,7 +29,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsAccelerationTestCases diff --git a/tests/accessibility/Android.mk b/tests/accessibility/Android.mk index 7af9d90c0f1..d8da5efe22e 100644 --- a/tests/accessibility/Android.mk +++ b/tests/accessibility/Android.mk @@ -27,7 +27,7 @@ LOCAL_PACKAGE_NAME := CtsAccessibilityTestCases LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := test_current diff --git a/tests/accessibilityservice/Android.mk b/tests/accessibilityservice/Android.mk index 62f2e57900c..e85d6ad9f6b 100644 --- a/tests/accessibilityservice/Android.mk +++ b/tests/accessibilityservice/Android.mk @@ -23,7 +23,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner mockito-target-minus-junit4 LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsAccessibilityServiceTestCases diff --git a/tests/admin/Android.mk b/tests/admin/Android.mk index 595c0a308e6..d30cca1ce7d 100644 --- a/tests/admin/Android.mk +++ b/tests/admin/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsAdminTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_INSTRUMENTATION_FOR := CtsAdminApp diff --git a/tests/admin/app/Android.mk b/tests/admin/app/Android.mk index aac8a89613f..648046ec155 100644 --- a/tests/admin/app/Android.mk +++ b/tests/admin/app/Android.mk @@ -29,7 +29,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsAdminApp # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/app/Android.mk b/tests/app/Android.mk index bb1dc100d2d..f479dca627f 100644 --- a/tests/app/Android.mk +++ b/tests/app/Android.mk @@ -37,7 +37,7 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under, appSdk25/src) \ # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsAppTestCases diff --git a/tests/app/app/Android.mk b/tests/app/app/Android.mk index 2e4bdf0c8de..102ad027f28 100644 --- a/tests/app/app/Android.mk +++ b/tests/app/app/Android.mk @@ -36,7 +36,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ src/android/app/stubs/ISecondary.aidl # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsAppTestStubs diff --git a/tests/app/app2/Android.mk b/tests/app/app2/Android.mk index 794c68923e0..6c5ea7ce13e 100644 --- a/tests/app/app2/Android.mk +++ b/tests/app/app2/Android.mk @@ -30,7 +30,7 @@ LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := CtsAppTestStubsDifferentUid # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_DEX_PREOPT := false diff --git a/tests/app/appSdk25/Android.mk b/tests/app/appSdk25/Android.mk index 64eda916e69..e08de217dfc 100644 --- a/tests/app/appSdk25/Android.mk +++ b/tests/app/appSdk25/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES := \ LOCAL_SDK_VERSION := 25 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsAppTestSdk25 diff --git a/tests/aslr/Android.mk b/tests/aslr/Android.mk index 6ad636bc730..9b4866f9057 100644 --- a/tests/aslr/Android.mk +++ b/tests/aslr/Android.mk @@ -33,6 +33,6 @@ LOCAL_STATIC_LIBRARIES := \ libgtest # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_EXECUTABLE) diff --git a/tests/autofillservice/Android.mk b/tests/autofillservice/Android.mk index 37605afda46..4a1a6add458 100644 --- a/tests/autofillservice/Android.mk +++ b/tests/autofillservice/Android.mk @@ -28,7 +28,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsAutoFillServiceTestCases diff --git a/tests/backup/Android.mk b/tests/backup/Android.mk index d791fa69961..c8c7d87abde 100644 --- a/tests/backup/Android.mk +++ b/tests/backup/Android.mk @@ -28,7 +28,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner ctstestse LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsBackupTestCases diff --git a/tests/backup/app/Android.mk b/tests/backup/app/Android.mk index 8d7e3e93a63..dd1992b9c0a 100644 --- a/tests/backup/app/Android.mk +++ b/tests/backup/app/Android.mk @@ -25,7 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsBackupApp # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := \ compatibility-device-util \ diff --git a/tests/camera/Android.mk b/tests/camera/Android.mk index af7474eeb52..186cf962890 100644 --- a/tests/camera/Android.mk +++ b/tests/camera/Android.mk @@ -58,7 +58,7 @@ LOCAL_SRC_FILES := \ $(call all-renderscript-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsCameraTestCases diff --git a/tests/dram/Android.mk b/tests/dram/Android.mk index e286e8d26a4..5c44668e39e 100644 --- a/tests/dram/Android.mk +++ b/tests/dram/Android.mk @@ -30,7 +30,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsDramTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := 16 diff --git a/tests/filesystem/Android.mk b/tests/filesystem/Android.mk index 417d7c4c8df..97f24b0f68f 100644 --- a/tests/filesystem/Android.mk +++ b/tests/filesystem/Android.mk @@ -25,7 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsFileSystemTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := 16 diff --git a/tests/fragment/Android.mk b/tests/fragment/Android.mk index 053e66829b5..2c277e22675 100644 --- a/tests/fragment/Android.mk +++ b/tests/fragment/Android.mk @@ -40,7 +40,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += \ LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/inputmethod/Android.mk b/tests/inputmethod/Android.mk index 7de22d447ae..5093e6f5ece 100644 --- a/tests/inputmethod/Android.mk +++ b/tests/inputmethod/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MULTILIB := both diff --git a/tests/jank/Android.mk b/tests/jank/Android.mk index 0d4f5337dc5..8e2348b4720 100644 --- a/tests/jank/Android.mk +++ b/tests/jank/Android.mk @@ -25,7 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsJankDeviceTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := \ compatibility-device-util \ diff --git a/tests/jdwp/Android.mk b/tests/jdwp/Android.mk index 87ea31ebc24..da4ea384d05 100644 --- a/tests/jdwp/Android.mk +++ b/tests/jdwp/Android.mk @@ -24,7 +24,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := apache-harmony-jdwp-tests LOCAL_MODULE_TAGS := optional # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_JAVA_LIBRARY) diff --git a/tests/jdwp/runner/device-side/Android.mk b/tests/jdwp/runner/device-side/Android.mk index 871fc39dabf..f04bf4a2b03 100644 --- a/tests/jdwp/runner/device-side/Android.mk +++ b/tests/jdwp/runner/device-side/Android.mk @@ -30,6 +30,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util junit LOCAL_MODULE_TAGS := optional # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_JAVA_LIBRARY) diff --git a/tests/jdwp/runner/host-side/Android.mk b/tests/jdwp/runner/host-side/Android.mk index 7398f69d06f..702174c9a71 100644 --- a/tests/jdwp/runner/host-side/Android.mk +++ b/tests/jdwp/runner/host-side/Android.mk @@ -30,6 +30,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_JAVA_RESOURCE_DIRS := resources # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/tests/leanbackjank/Android.mk b/tests/leanbackjank/Android.mk index 25fd9a0f3bf..5b5f053e90c 100644 --- a/tests/leanbackjank/Android.mk +++ b/tests/leanbackjank/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ LOCAL_PACKAGE_NAME := CtsLeanbackJankTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := \ compatibility-device-util \ diff --git a/tests/leanbackjank/app/Android.mk b/tests/leanbackjank/app/Android.mk index 0328fdf444f..926dfd6dcd5 100644 --- a/tests/leanbackjank/app/Android.mk +++ b/tests/leanbackjank/app/Android.mk @@ -25,7 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsLeanbackJankApp # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_RESOURCE_DIR := \ $(TOP)/frameworks/support/v17/leanback/res \ diff --git a/tests/libcore/javautilcollections/Android.mk b/tests/libcore/javautilcollections/Android.mk index 2c7b7b1ae98..fc90888b373 100644 --- a/tests/libcore/javautilcollections/Android.mk +++ b/tests/libcore/javautilcollections/Android.mk @@ -29,6 +29,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ guava-testlib-20.0-prebuilt LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsLibcoreJavaUtilCollectionsTestCases -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/libcore/jsr166/Android.mk b/tests/libcore/jsr166/Android.mk index e71bb57662d..25c7ce56df7 100644 --- a/tests/libcore/jsr166/Android.mk +++ b/tests/libcore/jsr166/Android.mk @@ -34,7 +34,7 @@ LOCAL_JACK_FLAGS := --multi-dex native LOCAL_PROGUARD_ENABLED := disabled # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_JAVA_RESOURCE_FILES := \ libcore/expectations/brokentests.txt \ diff --git a/tests/libcore/luni/Android.mk b/tests/libcore/luni/Android.mk index c42a9872ff7..675f034ea8f 100644 --- a/tests/libcore/luni/Android.mk +++ b/tests/libcore/luni/Android.mk @@ -46,7 +46,7 @@ LOCAL_JNI_SHARED_LIBRARIES := libjavacoretests libsqlite_jni libnativehelper_com LOCAL_MULTILIB := both # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_JAVA_RESOURCE_FILES := \ libcore/expectations/brokentests.txt \ diff --git a/tests/libcore/ojluni/Android.mk b/tests/libcore/ojluni/Android.mk index 36ba4f2bb84..8bea21d9899 100644 --- a/tests/libcore/ojluni/Android.mk +++ b/tests/libcore/ojluni/Android.mk @@ -37,7 +37,7 @@ LOCAL_PROGUARD_ENABLED := disabled LOCAL_MULTILIB := both # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_JAVA_RESOURCE_FILES := \ libcore/expectations/brokentests.txt \ diff --git a/tests/libcore/okhttp/Android.mk b/tests/libcore/okhttp/Android.mk index 840f1a27440..e6cc495b675 100644 --- a/tests/libcore/okhttp/Android.mk +++ b/tests/libcore/okhttp/Android.mk @@ -40,7 +40,7 @@ LOCAL_PROGUARD_ENABLED := disabled LOCAL_MULTILIB := both # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_JAVA_RESOURCE_FILES := \ libcore/expectations/brokentests.txt \ diff --git a/tests/libcore/runner/Android.mk b/tests/libcore/runner/Android.mk index d7399cdfd4a..3b20cfaf17a 100644 --- a/tests/libcore/runner/Android.mk +++ b/tests/libcore/runner/Android.mk @@ -33,6 +33,6 @@ LOCAL_JACK_FLAGS := --multi-dex native LOCAL_PROGUARD_ENABLED := disabled # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_SUPPORT_PACKAGE) diff --git a/tests/libcore/wycheproof/Android.mk b/tests/libcore/wycheproof/Android.mk index d568e6a2109..c9df5c2e68b 100644 --- a/tests/libcore/wycheproof/Android.mk +++ b/tests/libcore/wycheproof/Android.mk @@ -44,7 +44,7 @@ LOCAL_PROGUARD_ENABLED := disabled LOCAL_MULTILIB := both # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_JAVA_RESOURCE_FILES := \ libcore/expectations/brokentests.txt \ diff --git a/tests/netlegacy22.api/Android.mk b/tests/netlegacy22.api/Android.mk index 3fca09866aa..836bd9b7da1 100644 --- a/tests/netlegacy22.api/Android.mk +++ b/tests/netlegacy22.api/Android.mk @@ -30,6 +30,6 @@ LOCAL_SDK_VERSION := 22 LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/netlegacy22.permission/Android.mk b/tests/netlegacy22.permission/Android.mk index d21cd6766f6..2f9221dd6f1 100644 --- a/tests/netlegacy22.permission/Android.mk +++ b/tests/netlegacy22.permission/Android.mk @@ -30,6 +30,6 @@ LOCAL_SDK_VERSION := 22 LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/netsecpolicy/usescleartexttraffic-false/Android.mk b/tests/netsecpolicy/usescleartexttraffic-false/Android.mk index 6b24a3765b5..847d5ec11f0 100644 --- a/tests/netsecpolicy/usescleartexttraffic-false/Android.mk +++ b/tests/netsecpolicy/usescleartexttraffic-false/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, \ LOCAL_PACKAGE_NAME := CtsNetSecPolicyUsesCleartextTrafficFalse # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/netsecpolicy/usescleartexttraffic-true/Android.mk b/tests/netsecpolicy/usescleartexttraffic-true/Android.mk index 972795928c0..95da49531b5 100644 --- a/tests/netsecpolicy/usescleartexttraffic-true/Android.mk +++ b/tests/netsecpolicy/usescleartexttraffic-true/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, \ LOCAL_PACKAGE_NAME := CtsNetSecPolicyUsesCleartextTrafficTrue # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk b/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk index 7a964cc826b..009b3fcc104 100644 --- a/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk +++ b/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, \ LOCAL_PACKAGE_NAME := CtsNetSecPolicyUsesCleartextTrafficUnspecified # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/openglperf2/Android.mk b/tests/openglperf2/Android.mk index f46c7d46c79..0a87b05e5d0 100644 --- a/tests/openglperf2/Android.mk +++ b/tests/openglperf2/Android.mk @@ -30,7 +30,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsOpenGlPerf2TestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := 16 diff --git a/tests/pdf/Android.mk b/tests/pdf/Android.mk index 1e4a1caa690..3a7e2a00a59 100644 --- a/tests/pdf/Android.mk +++ b/tests/pdf/Android.mk @@ -34,7 +34,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += \ LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsPdfTestCases diff --git a/tests/sample/Android.mk b/tests/sample/Android.mk index 419faa5c6b8..413063b35c2 100755 --- a/tests/sample/Android.mk +++ b/tests/sample/Android.mk @@ -30,7 +30,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsSampleDeviceTestCases diff --git a/tests/sensor/Android.mk b/tests/sensor/Android.mk index 7b6dd32ee6b..d34cd429876 100644 --- a/tests/sensor/Android.mk +++ b/tests/sensor/Android.mk @@ -73,7 +73,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # include both the 32 and 64 bit versions LOCAL_MULTILIB := both diff --git a/tests/signature/Android.mk b/tests/signature/Android.mk index 8502c59dd38..76fec77099b 100644 --- a/tests/signature/Android.mk +++ b/tests/signature/Android.mk @@ -23,7 +23,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsSignatureTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/signature/api/Android.mk b/tests/signature/api/Android.mk index 3d67cd8ca93..fed7d66e184 100644 --- a/tests/signature/api/Android.mk +++ b/tests/signature/api/Android.mk @@ -29,7 +29,7 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_ETC) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_SYSTEM)/base_rules.mk $(LOCAL_BUILT_MODULE) : frameworks/base/api/current.txt | $(APICHECK) @@ -48,7 +48,7 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_ETC) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_SYSTEM)/base_rules.mk $(LOCAL_BUILT_MODULE) : frameworks/base/api/system-current.txt | $(APICHECK) diff --git a/tests/simplecpu/Android.mk b/tests/simplecpu/Android.mk index cb13016fdb0..1d006e128ad 100644 --- a/tests/simplecpu/Android.mk +++ b/tests/simplecpu/Android.mk @@ -30,7 +30,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsSimpleCpuTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := 16 diff --git a/tests/tests/accounts/Android.mk b/tests/tests/accounts/Android.mk index 7d3187c32a4..15192791787 100644 --- a/tests/tests/accounts/Android.mk +++ b/tests/tests/accounts/Android.mk @@ -33,7 +33,7 @@ LOCAL_PACKAGE_NAME := CtsAccountManagerTestCases 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) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/Android.mk b/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/Android.mk index 73fb4f31d1f..315a046e62e 100644 --- a/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/Android.mk +++ b/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/Android.mk @@ -36,7 +36,7 @@ LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := CtsUnaffiliatedAccountAuthenticators # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/alarmclock/Android.mk b/tests/tests/alarmclock/Android.mk index 6c74c5cb478..7810ad8f973 100644 --- a/tests/tests/alarmclock/Android.mk +++ b/tests/tests/alarmclock/Android.mk @@ -30,7 +30,7 @@ LOCAL_PACKAGE_NAME := CtsAlarmClockTestCases 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) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/tests/alarmclock/common/Android.mk b/tests/tests/alarmclock/common/Android.mk index ec0022b6622..7e95cff2455 100644 --- a/tests/tests/alarmclock/common/Android.mk +++ b/tests/tests/alarmclock/common/Android.mk @@ -28,6 +28,6 @@ LOCAL_MODULE := CtsAlarmClockCommon LOCAL_SDK_VERSION := current # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/tests/tests/alarmclock/service/Android.mk b/tests/tests/alarmclock/service/Android.mk index 14fdd5dd020..645393bbb90 100644 --- a/tests/tests/alarmclock/service/Android.mk +++ b/tests/tests/alarmclock/service/Android.mk @@ -30,6 +30,6 @@ LOCAL_PACKAGE_NAME := CtsAlarmClockService 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_SUPPORT_PACKAGE) diff --git a/tests/tests/animation/Android.mk b/tests/tests/animation/Android.mk index 2aeac8847f9..80120f1db60 100644 --- a/tests/tests/animation/Android.mk +++ b/tests/tests/animation/Android.mk @@ -37,6 +37,6 @@ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/app.usage/Android.mk b/tests/tests/app.usage/Android.mk index f8bab5bbf97..5a9745065a5 100644 --- a/tests/tests/app.usage/Android.mk +++ b/tests/tests/app.usage/Android.mk @@ -35,6 +35,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/app/Android.mk b/tests/tests/app/Android.mk index d710ce8810a..b85609edcf8 100644 --- a/tests/tests/app/Android.mk +++ b/tests/tests/app/Android.mk @@ -35,6 +35,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/appwidget/Android.mk b/tests/tests/appwidget/Android.mk index 077461dac42..c4abdeb2009 100644 --- a/tests/tests/appwidget/Android.mk +++ b/tests/tests/appwidget/Android.mk @@ -32,7 +32,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ legacy-android-test # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/appwidget/packages/launchermanifest/Android.mk b/tests/tests/appwidget/packages/launchermanifest/Android.mk index 9746d2bed22..01a48d56527 100644 --- a/tests/tests/appwidget/packages/launchermanifest/Android.mk +++ b/tests/tests/appwidget/packages/launchermanifest/Android.mk @@ -31,7 +31,7 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \ LOCAL_SDK_VERSION := current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_AAPT_FLAGS += --rename-manifest-package android.appwidget.cts.packages.launcher1 @@ -54,7 +54,7 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := \ LOCAL_SDK_VERSION := current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_AAPT_FLAGS += --rename-manifest-package android.appwidget.cts.packages.launcher2 @@ -75,7 +75,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, ../src) \ LOCAL_SDK_VERSION := current # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_AAPT_FLAGS += --rename-manifest-package android.appwidget.cts.packages.launcher3 diff --git a/tests/tests/assist/Android.mk b/tests/tests/assist/Android.mk index 9b7d774ca78..49ec503cf07 100644 --- a/tests/tests/assist/Android.mk +++ b/tests/tests/assist/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := CtsAssistCommon ctstestrunner compatibility-device-util diff --git a/tests/tests/assist/service/Android.mk b/tests/tests/assist/service/Android.mk index 9b9ed840ea7..de3fdca560a 100644 --- a/tests/tests/assist/service/Android.mk +++ b/tests/tests/assist/service/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsAssistService # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/assist/testapp/Android.mk b/tests/tests/assist/testapp/Android.mk index f21fc39e624..284da7b07c3 100644 --- a/tests/tests/assist/testapp/Android.mk +++ b/tests/tests/assist/testapp/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsAssistApp # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/bionic/Android.mk b/tests/tests/bionic/Android.mk index 6c4009cd519..05ae8be0a18 100644 --- a/tests/tests/bionic/Android.mk +++ b/tests/tests/bionic/Android.mk @@ -39,7 +39,7 @@ LOCAL_STATIC_LIBRARIES += \ LOCAL_CXX_STL := libc++_static # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.bionic diff --git a/tests/tests/bluetooth/Android.mk b/tests/tests/bluetooth/Android.mk index c02b23d7808..c278d3d18f1 100644 --- a/tests/tests/bluetooth/Android.mk +++ b/tests/tests/bluetooth/Android.mk @@ -32,6 +32,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 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) diff --git a/tests/tests/calendarcommon/Android.mk b/tests/tests/calendarcommon/Android.mk index 7a8296c7ef8..8d4535892c3 100644 --- a/tests/tests/calendarcommon/Android.mk +++ b/tests/tests/calendarcommon/Android.mk @@ -32,6 +32,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 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) diff --git a/tests/tests/calllog/Android.mk b/tests/tests/calllog/Android.mk index 105f1885aec..5667f44a737 100644 --- a/tests/tests/calllog/Android.mk +++ b/tests/tests/calllog/Android.mk @@ -33,6 +33,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 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) diff --git a/tests/tests/car/Android.mk b/tests/tests/car/Android.mk index cebd099f89d..9e2e869de2a 100644 --- a/tests/tests/car/Android.mk +++ b/tests/tests/car/Android.mk @@ -31,7 +31,7 @@ LOCAL_JAVA_LIBRARIES := android.car LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/carrierapi/Android.mk b/tests/tests/carrierapi/Android.mk index 298c6abe266..f66bfcad33d 100644 --- a/tests/tests/carrierapi/Android.mk +++ b/tests/tests/carrierapi/Android.mk @@ -33,7 +33,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsCarrierApiTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_JAVA_LIBRARIES += android.test.runner telephony-common diff --git a/tests/tests/colormode/Android.mk b/tests/tests/colormode/Android.mk index d1870696738..2a585d7bf11 100644 --- a/tests/tests/colormode/Android.mk +++ b/tests/tests/colormode/Android.mk @@ -29,7 +29,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsColorModeTestCases diff --git a/tests/tests/contactsproviderwipe/Android.mk b/tests/tests/contactsproviderwipe/Android.mk index 42ca2b6cac1..a4a01b856b9 100644 --- a/tests/tests/contactsproviderwipe/Android.mk +++ b/tests/tests/contactsproviderwipe/Android.mk @@ -34,7 +34,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsContactsProviderWipe -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := test_current diff --git a/tests/tests/content/Android.mk b/tests/tests/content/Android.mk index 6821a39993a..2c1c567e4c1 100644 --- a/tests/tests/content/Android.mk +++ b/tests/tests/content/Android.mk @@ -48,7 +48,7 @@ LOCAL_MULTILIB := both LOCAL_PACKAGE_NAME := CtsContentTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/database/Android.mk b/tests/tests/database/Android.mk index 1be93c6dfde..4378dc54de1 100644 --- a/tests/tests/database/Android.mk +++ b/tests/tests/database/Android.mk @@ -35,6 +35,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsDatabaseTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/debug/Android.mk b/tests/tests/debug/Android.mk index e2164b02428..ff2d50f37a9 100644 --- a/tests/tests/debug/Android.mk +++ b/tests/tests/debug/Android.mk @@ -28,7 +28,7 @@ LOCAL_MULTILIB := both LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner diff --git a/tests/tests/display/Android.mk b/tests/tests/display/Android.mk index 4ad08a3820b..85963c75bf4 100644 --- a/tests/tests/display/Android.mk +++ b/tests/tests/display/Android.mk @@ -30,7 +30,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := android-support-test # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsDisplayTestCases diff --git a/tests/tests/dpi/Android.mk b/tests/tests/dpi/Android.mk index 963db7adfd0..cfd81653589 100644 --- a/tests/tests/dpi/Android.mk +++ b/tests/tests/dpi/Android.mk @@ -31,7 +31,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) 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) diff --git a/tests/tests/dpi2/Android.mk b/tests/tests/dpi2/Android.mk index 6e7c6498481..1fcedf147c6 100644 --- a/tests/tests/dpi2/Android.mk +++ b/tests/tests/dpi2/Android.mk @@ -31,6 +31,6 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) 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) diff --git a/tests/tests/dreams/Android.mk b/tests/tests/dreams/Android.mk index eb46897bbb8..5ae5d855ee0 100644 --- a/tests/tests/dreams/Android.mk +++ b/tests/tests/dreams/Android.mk @@ -34,6 +34,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) #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) diff --git a/tests/tests/drm/Android.mk b/tests/tests/drm/Android.mk index d67c048afdb..3b97bec391b 100644 --- a/tests/tests/drm/Android.mk +++ b/tests/tests/drm/Android.mk @@ -29,7 +29,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsDrmTestCases diff --git a/tests/tests/effect/Android.mk b/tests/tests/effect/Android.mk index c347152c900..bf780717768 100644 --- a/tests/tests/effect/Android.mk +++ b/tests/tests/effect/Android.mk @@ -29,7 +29,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/externalservice/Android.mk b/tests/tests/externalservice/Android.mk index 14e82c5c360..cc9c51862ca 100644 --- a/tests/tests/externalservice/Android.mk +++ b/tests/tests/externalservice/Android.mk @@ -30,7 +30,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := CtsExternalServiceCommon compatibility-device-uti LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsExternalServiceTestCases diff --git a/tests/tests/externalservice/service/Android.mk b/tests/tests/externalservice/service/Android.mk index e99a71d940e..c2cea8a95ef 100644 --- a/tests/tests/externalservice/service/Android.mk +++ b/tests/tests/externalservice/service/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsExternalServiceService # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/gesture/Android.mk b/tests/tests/gesture/Android.mk index 7d7158572b5..3ac8ca3da92 100755 --- a/tests/tests/gesture/Android.mk +++ b/tests/tests/gesture/Android.mk @@ -30,7 +30,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := android-support-test # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsGestureTestCases diff --git a/tests/tests/graphics/Android.mk b/tests/tests/graphics/Android.mk index 3059d719fc4..302b820458d 100644 --- a/tests/tests/graphics/Android.mk +++ b/tests/tests/graphics/Android.mk @@ -38,7 +38,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsGraphicsTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/hardware/Android.mk b/tests/tests/hardware/Android.mk index 957c012192a..68e7e503e5a 100644 --- a/tests/tests/hardware/Android.mk +++ b/tests/tests/hardware/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MULTILIB := both diff --git a/tests/tests/icu/Android.mk b/tests/tests/icu/Android.mk index 45fed49e841..4a65c44fbee 100644 --- a/tests/tests/icu/Android.mk +++ b/tests/tests/icu/Android.mk @@ -34,7 +34,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-icu4j-tests # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsIcuTestCases diff --git a/tests/tests/incident/Android.mk b/tests/tests/incident/Android.mk index 7d07ec0f165..711d65e7c02 100644 --- a/tests/tests/incident/Android.mk +++ b/tests/tests/incident/Android.mk @@ -27,7 +27,7 @@ LOCAL_SRC_FILES := \ LOCAL_PACKAGE_NAME := CtsIncidentTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests #LOCAL_SDK_VERSION := current LOCAL_JAVA_LIBRARIES += android.test.runner diff --git a/tests/tests/jni/Android.mk b/tests/tests/jni/Android.mk index 7672d2f7a3a..38111fc95dd 100644 --- a/tests/tests/jni/Android.mk +++ b/tests/tests/jni/Android.mk @@ -28,7 +28,7 @@ LOCAL_MULTILIB := both LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner android-support-test diff --git a/tests/tests/keystore/Android.mk b/tests/tests/keystore/Android.mk index ae1b804bf09..21578d4abac 100644 --- a/tests/tests/keystore/Android.mk +++ b/tests/tests/keystore/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_JAVA_LIBRARIES := bouncycastle diff --git a/tests/tests/libcorefileio/Android.mk b/tests/tests/libcorefileio/Android.mk index d329c9d39f0..066d72759f6 100644 --- a/tests/tests/libcorefileio/Android.mk +++ b/tests/tests/libcorefileio/Android.mk @@ -28,6 +28,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsLibcoreFileIOTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/libcorelegacy22/Android.mk b/tests/tests/libcorelegacy22/Android.mk index 408fd3bf07f..27883370a36 100644 --- a/tests/tests/libcorelegacy22/Android.mk +++ b/tests/tests/libcorelegacy22/Android.mk @@ -30,6 +30,6 @@ LOCAL_PACKAGE_NAME := CtsLibcoreLegacy22TestCases LOCAL_SDK_VERSION := 22 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/location/Android.mk b/tests/tests/location/Android.mk index bfd9a08dbc7..3c982877c15 100644 --- a/tests/tests/location/Android.mk +++ b/tests/tests/location/Android.mk @@ -45,7 +45,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner diff --git a/tests/tests/location2/Android.mk b/tests/tests/location2/Android.mk index a081213d432..de01ba831c4 100644 --- a/tests/tests/location2/Android.mk +++ b/tests/tests/location2/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner junit legacy-android-test diff --git a/tests/tests/media/Android.mk b/tests/tests/media/Android.mk index 1fb54607ce5..3715c21a763 100644 --- a/tests/tests/media/Android.mk +++ b/tests/tests/media/Android.mk @@ -76,7 +76,7 @@ LOCAL_PACKAGE_NAME := CtsMediaTestCases LOCAL_JAVA_LIBRARIES += android.test.runner org.apache.http.legacy # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/mediastress/Android.mk b/tests/tests/mediastress/Android.mk index 34bc7788067..55e7a3a1f85 100644 --- a/tests/tests/mediastress/Android.mk +++ b/tests/tests/mediastress/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # Include both the 32 and 64 bit versions LOCAL_MULTILIB := both diff --git a/tests/tests/mediastress/preconditions/Android.mk b/tests/tests/mediastress/preconditions/Android.mk index 573f083ab3b..c6c1cf2e719 100644 --- a/tests/tests/mediastress/preconditions/Android.mk +++ b/tests/tests/mediastress/preconditions/Android.mk @@ -25,7 +25,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := compatibility-host-media-preconditions # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/mediastress/preconditions/app/Android.mk b/tests/tests/mediastress/preconditions/app/Android.mk index 0ef2de44c4a..8630ac17a67 100644 --- a/tests/tests/mediastress/preconditions/app/Android.mk +++ b/tests/tests/mediastress/preconditions/app/Android.mk @@ -30,7 +30,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsMediaPreparerApp diff --git a/tests/tests/midi/Android.mk b/tests/tests/midi/Android.mk index eeda8c8e0d8..4192e5dc875 100755 --- a/tests/tests/midi/Android.mk +++ b/tests/tests/midi/Android.mk @@ -23,7 +23,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner diff --git a/tests/tests/multiuser/Android.mk b/tests/tests/multiuser/Android.mk index 67db1f5b180..e85fed25478 100644 --- a/tests/tests/multiuser/Android.mk +++ b/tests/tests/multiuser/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/tests/tests/nativehardware/Android.mk b/tests/tests/nativehardware/Android.mk index 7f053958358..ad54a36c9f2 100644 --- a/tests/tests/nativehardware/Android.mk +++ b/tests/tests/nativehardware/Android.mk @@ -35,7 +35,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_CTS_TEST_PACKAGE := android.nativehardware # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current LOCAL_NDK_STL_VARIANT := c++_static diff --git a/tests/tests/nativemedia/aaudio/Android.mk b/tests/tests/nativemedia/aaudio/Android.mk index e37df4934b9..26d8b321d98 100644 --- a/tests/tests/nativemedia/aaudio/Android.mk +++ b/tests/tests/nativemedia/aaudio/Android.mk @@ -42,7 +42,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_CTS_TEST_PACKAGE := android.nativemedia.aaudio # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CFLAGS := -Werror -Wall diff --git a/tests/tests/nativemedia/sl/Android.mk b/tests/tests/nativemedia/sl/Android.mk index 2c50cd76008..2e99354b090 100644 --- a/tests/tests/nativemedia/sl/Android.mk +++ b/tests/tests/nativemedia/sl/Android.mk @@ -42,7 +42,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_CTS_TEST_PACKAGE := android.nativemedia.sl # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CFLAGS := -Werror -Wall diff --git a/tests/tests/nativemedia/xa/Android.mk b/tests/tests/nativemedia/xa/Android.mk index 8ea10625417..1a9fe437180 100644 --- a/tests/tests/nativemedia/xa/Android.mk +++ b/tests/tests/nativemedia/xa/Android.mk @@ -41,6 +41,6 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_CTS_TEST_PACKAGE := android.nativemedia.xa # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_EXECUTABLE) diff --git a/tests/tests/ndef/Android.mk b/tests/tests/ndef/Android.mk index bd60a1a6c4c..47f45c921f4 100644 --- a/tests/tests/ndef/Android.mk +++ b/tests/tests/ndef/Android.mk @@ -31,6 +31,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 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) diff --git a/tests/tests/net/Android.mk b/tests/tests/net/Android.mk index 98cde9b8744..3493ccb0ea9 100644 --- a/tests/tests/net/Android.mk +++ b/tests/tests/net/Android.mk @@ -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) diff --git a/tests/tests/net/appForApi23/Android.mk b/tests/tests/net/appForApi23/Android.mk index f0d3535cf42..ea99684718a 100644 --- a/tests/tests/net/appForApi23/Android.mk +++ b/tests/tests/net/appForApi23/Android.mk @@ -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) diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk b/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk index 6dec23f3b6c..cfae6189e2f 100644 --- a/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk +++ b/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk @@ -31,7 +31,7 @@ LOCAL_PACKAGE_NAME := CtsNetSecPolicyUsesCleartextTrafficFalseTestCases LOCAL_INSTRUMENTATION_FOR := CtsNetSecPolicyUsesCleartextTrafficFalse # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk b/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk index 6df748d6d43..72538f74dca 100644 --- a/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk +++ b/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk @@ -31,7 +31,7 @@ LOCAL_PACKAGE_NAME := CtsNetSecPolicyUsesCleartextTrafficTrueTestCases LOCAL_INSTRUMENTATION_FOR := CtsNetSecPolicyUsesCleartextTrafficTrue # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk b/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk index 6f350272259..dbf73103bd8 100644 --- a/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk +++ b/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk @@ -31,7 +31,7 @@ LOCAL_PACKAGE_NAME := CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases LOCAL_INSTRUMENTATION_FOR := CtsNetSecPolicyUsesCleartextTrafficUnspecified # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-attributes/Android.mk b/tests/tests/networksecurityconfig/networksecurityconfig-attributes/Android.mk index 56c5d25d946..d2ddb279abe 100644 --- a/tests/tests/networksecurityconfig/networksecurityconfig-attributes/Android.mk +++ b/tests/tests/networksecurityconfig/networksecurityconfig-attributes/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES += $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res/ # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current include $(BUILD_CTS_PACKAGE)
\ No newline at end of file diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-basic-domain/Android.mk b/tests/tests/networksecurityconfig/networksecurityconfig-basic-domain/Android.mk index 2b91bc662ce..716fecf14d2 100644 --- a/tests/tests/networksecurityconfig/networksecurityconfig-basic-domain/Android.mk +++ b/tests/tests/networksecurityconfig/networksecurityconfig-basic-domain/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES += $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res/ # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current include $(BUILD_CTS_PACKAGE)
\ No newline at end of file diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-cleartext/Android.mk b/tests/tests/networksecurityconfig/networksecurityconfig-cleartext/Android.mk index df29b5f4130..928b95d678c 100644 --- a/tests/tests/networksecurityconfig/networksecurityconfig-cleartext/Android.mk +++ b/tests/tests/networksecurityconfig/networksecurityconfig-cleartext/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES += $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res/ # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-disabled/Android.mk b/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-disabled/Android.mk index 59e56255c53..4a55d8147ac 100644 --- a/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-disabled/Android.mk +++ b/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-disabled/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES += $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res/ # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current include $(BUILD_CTS_PACKAGE)
\ No newline at end of file diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-enabled/Android.mk b/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-enabled/Android.mk index c935486a991..22ec6c72477 100644 --- a/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-enabled/Android.mk +++ b/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-enabled/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES += $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res/ # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk b/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk index 3993d00a349..c544c4c899b 100644 --- a/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk +++ b/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES += $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res/ # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-invalid-pin/Android.mk b/tests/tests/networksecurityconfig/networksecurityconfig-invalid-pin/Android.mk index a89bad015f6..cbfd091d1ba 100644 --- a/tests/tests/networksecurityconfig/networksecurityconfig-invalid-pin/Android.mk +++ b/tests/tests/networksecurityconfig/networksecurityconfig-invalid-pin/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES += $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res/ # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-nested-domains/Android.mk b/tests/tests/networksecurityconfig/networksecurityconfig-nested-domains/Android.mk index d68073d41fa..2ae8d6cb13c 100644 --- a/tests/tests/networksecurityconfig/networksecurityconfig-nested-domains/Android.mk +++ b/tests/tests/networksecurityconfig/networksecurityconfig-nested-domains/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES += $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res/ # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk b/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk index cace6d05cfa..4d975916713 100644 --- a/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk +++ b/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES += $(call all-java-files-under, ../src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res/ # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/opengl/Android.mk b/tests/tests/opengl/Android.mk index 64f0f79f6dc..e31db450ed0 100644 --- a/tests/tests/opengl/Android.mk +++ b/tests/tests/opengl/Android.mk @@ -37,7 +37,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 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) diff --git a/tests/tests/openglperf/Android.mk b/tests/tests/openglperf/Android.mk index 46e316aae4b..fcc2ba675a7 100644 --- a/tests/tests/openglperf/Android.mk +++ b/tests/tests/openglperf/Android.mk @@ -37,7 +37,7 @@ LOCAL_INSTRUMENTATION_FOR := com.replica.replicaisland 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) diff --git a/tests/tests/os/Android.mk b/tests/tests/os/Android.mk index c99e2366925..ccc72a12ade 100644 --- a/tests/tests/os/Android.mk +++ b/tests/tests/os/Android.mk @@ -44,7 +44,7 @@ LOCAL_SRC_FILES := \ LOCAL_PACKAGE_NAME := CtsOsTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # uncomment when b/13282254 is fixed #LOCAL_SDK_VERSION := current @@ -66,7 +66,7 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests cts_platform_version_path := cts/tests/tests/os/assets/platform_versions.txt cts_platform_version_string := $(shell cat $(cts_platform_version_path)) diff --git a/tests/tests/packageinstaller/adminpackageinstaller/Android.mk b/tests/tests/packageinstaller/adminpackageinstaller/Android.mk index a77f0c90bb0..67207dcabc6 100755 --- a/tests/tests/packageinstaller/adminpackageinstaller/Android.mk +++ b/tests/tests/packageinstaller/adminpackageinstaller/Android.mk @@ -31,6 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator android-support-test android-suppo LOCAL_SDK_VERSION := test_current # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/packageinstaller/emptytestapp/Android.mk b/tests/tests/packageinstaller/emptytestapp/Android.mk index c621852e30c..b1171f1f3ba 100644 --- a/tests/tests/packageinstaller/emptytestapp/Android.mk +++ b/tests/tests/packageinstaller/emptytestapp/Android.mk @@ -25,6 +25,6 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) 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) diff --git a/tests/tests/packageinstaller/externalsources/Android.mk b/tests/tests/packageinstaller/externalsources/Android.mk index 805385a86be..ca2fbdaf1cb 100755 --- a/tests/tests/packageinstaller/externalsources/Android.mk +++ b/tests/tests/packageinstaller/externalsources/Android.mk @@ -31,7 +31,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator android-support-test android-suppo 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) diff --git a/tests/tests/permission/Android.mk b/tests/tests/permission/Android.mk index 68fa1930b38..a88bb01e814 100644 --- a/tests/tests/permission/Android.mk +++ b/tests/tests/permission/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # Include both the 32 and 64 bit versions LOCAL_MULTILIB := both diff --git a/tests/tests/permission2/Android.mk b/tests/tests/permission2/Android.mk index d4f48f44dd0..1aef46bced2 100755 --- a/tests/tests/permission2/Android.mk +++ b/tests/tests/permission2/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_JAVA_LIBRARIES := telephony-common diff --git a/tests/tests/preference/Android.mk b/tests/tests/preference/Android.mk index fa6f9c9496c..d62e5b35038 100644 --- a/tests/tests/preference/Android.mk +++ b/tests/tests/preference/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner diff --git a/tests/tests/preference2/Android.mk b/tests/tests/preference2/Android.mk index c6dca9e5d8b..dca10c0cf25 100644 --- a/tests/tests/preference2/Android.mk +++ b/tests/tests/preference2/Android.mk @@ -23,7 +23,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := \ ctstestrunner \ diff --git a/tests/tests/print/Android.mk b/tests/tests/print/Android.mk index 405c89edf00..527fe487427 100644 --- a/tests/tests/print/Android.mk +++ b/tests/tests/print/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/tests/tests/proto/Android.mk b/tests/tests/proto/Android.mk index 23dba67de7f..58126e2824c 100644 --- a/tests/tests/proto/Android.mk +++ b/tests/tests/proto/Android.mk @@ -30,7 +30,7 @@ LOCAL_PROTOC_OPTIMIZE_TYPE := nano LOCAL_PACKAGE_NAME := CtsProtoTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests #LOCAL_SDK_VERSION := current LOCAL_JAVA_LIBRARIES += android.test.runner diff --git a/tests/tests/provider/Android.mk b/tests/tests/provider/Android.mk index 22983783cfb..3b7103562fd 100644 --- a/tests/tests/provider/Android.mk +++ b/tests/tests/provider/Android.mk @@ -26,7 +26,7 @@ LOCAL_MULTILIB := both LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common diff --git a/tests/tests/renderscript/Android.mk b/tests/tests/renderscript/Android.mk index 00e751abea0..64dab843dfd 100644 --- a/tests/tests/renderscript/Android.mk +++ b/tests/tests/renderscript/Android.mk @@ -38,7 +38,7 @@ LOCAL_RENDERSCRIPT_FLAGS := -Wno-error=deprecated-declarations 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) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/tests/renderscriptlegacy/Android.mk b/tests/tests/renderscriptlegacy/Android.mk index f29a290f4d3..fb93d05152a 100644 --- a/tests/tests/renderscriptlegacy/Android.mk +++ b/tests/tests/renderscriptlegacy/Android.mk @@ -31,6 +31,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := 19 # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/rsblas/Android.mk b/tests/tests/rsblas/Android.mk index 700fba325fb..cd64036bb14 100644 --- a/tests/tests/rsblas/Android.mk +++ b/tests/tests/rsblas/Android.mk @@ -35,7 +35,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-fil LOCAL_RENDERSCRIPT_FLAGS := -Wno-error=deprecated-declarations # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/rscpp/Android.mk b/tests/tests/rscpp/Android.mk index bdcf8400516..8c7dbe04c06 100644 --- a/tests/tests/rscpp/Android.mk +++ b/tests/tests/rscpp/Android.mk @@ -36,7 +36,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-fil 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) include $(LOCAL_PATH)/librscpptest/Android.mk diff --git a/tests/tests/sax/Android.mk b/tests/tests/sax/Android.mk index 498aa40e1b3..9dfc0022cab 100644 --- a/tests/tests/sax/Android.mk +++ b/tests/tests/sax/Android.mk @@ -30,6 +30,6 @@ LOCAL_PACKAGE_NAME := CtsSaxTestCases 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) diff --git a/tests/tests/security/Android.mk b/tests/tests/security/Android.mk index ddd78f1b4e1..4fb95ee38d8 100644 --- a/tests/tests/security/Android.mk +++ b/tests/tests/security/Android.mk @@ -51,7 +51,7 @@ LOCAL_PACKAGE_NAME := CtsSecurityTestCases #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) diff --git a/tests/tests/selinux/selinuxTargetSdk/Android.mk b/tests/tests/selinux/selinuxTargetSdk/Android.mk index cfbe04c7ece..750ac74abde 100755 --- a/tests/tests/selinux/selinuxTargetSdk/Android.mk +++ b/tests/tests/selinux/selinuxTargetSdk/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsSelinuxTargetSdkTestCases diff --git a/tests/tests/selinux/selinuxTargetSdk2/Android.mk b/tests/tests/selinux/selinuxTargetSdk2/Android.mk index 9397f97384f..0d1d2d7e208 100755 --- a/tests/tests/selinux/selinuxTargetSdk2/Android.mk +++ b/tests/tests/selinux/selinuxTargetSdk2/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsSelinuxTargetSdk2TestCases diff --git a/tests/tests/shortcutmanager/Android.mk b/tests/tests/shortcutmanager/Android.mk index 49a3b704155..ec5d89a3db9 100755 --- a/tests/tests/shortcutmanager/Android.mk +++ b/tests/tests/shortcutmanager/Android.mk @@ -36,7 +36,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ LOCAL_PACKAGE_NAME := CtsShortcutManagerTestCases -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := test_current diff --git a/tests/tests/shortcutmanager/packages/launchermanifest/Android.mk b/tests/tests/shortcutmanager/packages/launchermanifest/Android.mk index a11c978fc19..8c0bdb72922 100644 --- a/tests/tests/shortcutmanager/packages/launchermanifest/Android.mk +++ b/tests/tests/shortcutmanager/packages/launchermanifest/Android.mk @@ -38,7 +38,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 LOCAL_AAPT_FLAGS += --rename-manifest-package android.content.pm.cts.shortcutmanager.packages.launcher1 @@ -68,7 +68,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 LOCAL_AAPT_FLAGS += --rename-manifest-package android.content.pm.cts.shortcutmanager.packages.launcher2 @@ -98,7 +98,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 LOCAL_AAPT_FLAGS += --rename-manifest-package android.content.pm.cts.shortcutmanager.packages.launcher3 diff --git a/tests/tests/shortcutmanager/packages/launchermanifest_nonshared/Android.mk b/tests/tests/shortcutmanager/packages/launchermanifest_nonshared/Android.mk index bc4aaa7799a..509c724227f 100644 --- a/tests/tests/shortcutmanager/packages/launchermanifest_nonshared/Android.mk +++ b/tests/tests/shortcutmanager/packages/launchermanifest_nonshared/Android.mk @@ -37,7 +37,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 LOCAL_AAPT_FLAGS += --rename-manifest-package android.content.pm.cts.shortcutmanager.packages.launcher4 diff --git a/tests/tests/shortcutmanager/packages/packagemanifest/Android.mk b/tests/tests/shortcutmanager/packages/packagemanifest/Android.mk index 11031940e49..1ece5e94c39 100644 --- a/tests/tests/shortcutmanager/packages/packagemanifest/Android.mk +++ b/tests/tests/shortcutmanager/packages/packagemanifest/Android.mk @@ -37,7 +37,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 LOCAL_AAPT_FLAGS += --rename-manifest-package android.content.pm.cts.shortcutmanager.packages.package1 @@ -67,7 +67,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 LOCAL_AAPT_FLAGS += --rename-manifest-package android.content.pm.cts.shortcutmanager.packages.package2 @@ -97,7 +97,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 LOCAL_AAPT_FLAGS += --rename-manifest-package android.content.pm.cts.shortcutmanager.packages.package3 diff --git a/tests/tests/shortcutmanager/packages/packagemanifest_nonshared/Android.mk b/tests/tests/shortcutmanager/packages/packagemanifest_nonshared/Android.mk index 0b1ff531c7b..f87e2da3b6c 100644 --- a/tests/tests/shortcutmanager/packages/packagemanifest_nonshared/Android.mk +++ b/tests/tests/shortcutmanager/packages/packagemanifest_nonshared/Android.mk @@ -37,7 +37,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 LOCAL_AAPT_FLAGS += --rename-manifest-package android.content.pm.cts.shortcutmanager.packages.package4 diff --git a/tests/tests/shortcutmanager/throttling/Android.mk b/tests/tests/shortcutmanager/throttling/Android.mk index 7e6d869b261..a3794f8d35f 100644 --- a/tests/tests/shortcutmanager/throttling/Android.mk +++ b/tests/tests/shortcutmanager/throttling/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsShortcutManagerThrottlingTest diff --git a/tests/tests/simpleperf/Android.mk b/tests/tests/simpleperf/Android.mk index c7f2afbf596..80c5e551c3c 100644 --- a/tests/tests/simpleperf/Android.mk +++ b/tests/tests/simpleperf/Android.mk @@ -44,7 +44,7 @@ LOCAL_POST_LINK_CMD = \ $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJCOPY) --add-section .testzipdata=$$TMP_FILE $(linked_module) && \ rm -f $$TMP_FILE -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_CTS_TEST_PACKAGE := android.simpleperf LOCAL_FORCE_STATIC_EXECUTABLE := true diff --git a/tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk b/tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk index b84be25b8d7..4311b9bc787 100644 --- a/tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk +++ b/tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk @@ -30,6 +30,6 @@ LOCAL_PACKAGE_NAME := CtsSimpleperfDebugApp LOCAL_SDK_VERSION := current -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE)
\ No newline at end of file diff --git a/tests/tests/speech/Android.mk b/tests/tests/speech/Android.mk index 572871b06f5..39955107a0a 100755 --- a/tests/tests/speech/Android.mk +++ b/tests/tests/speech/Android.mk @@ -29,7 +29,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsSpeechTestCases diff --git a/tests/tests/systemintents/Android.mk b/tests/tests/systemintents/Android.mk index 1af6702d0d4..33747b42be4 100644 --- a/tests/tests/systemintents/Android.mk +++ b/tests/tests/systemintents/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/tests/tests/systemui/Android.mk b/tests/tests/systemui/Android.mk index 6aed2f842ea..4806f4b66c1 100644 --- a/tests/tests/systemui/Android.mk +++ b/tests/tests/systemui/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_JAVA_LIBRARIES := android.test.runner diff --git a/tests/tests/telecom/Android.mk b/tests/tests/telecom/Android.mk index c81a81140a1..535121cf47b 100644 --- a/tests/tests/telecom/Android.mk +++ b/tests/tests/telecom/Android.mk @@ -31,6 +31,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SDK_VERSION := test_current # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/telecom2/Android.mk b/tests/tests/telecom2/Android.mk index d839924c8d9..4bfc891e37a 100644 --- a/tests/tests/telecom2/Android.mk +++ b/tests/tests/telecom2/Android.mk @@ -46,6 +46,6 @@ LOCAL_AAPT_FLAGS := \ 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) diff --git a/tests/tests/telecom3/Android.mk b/tests/tests/telecom3/Android.mk index 7400fb56d88..a9afd3104e4 100644 --- a/tests/tests/telecom3/Android.mk +++ b/tests/tests/telecom3/Android.mk @@ -45,6 +45,6 @@ LOCAL_AAPT_FLAGS := \ 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) diff --git a/tests/tests/telephony/Android.mk b/tests/tests/telephony/Android.mk index e5023840701..58b6afd08e7 100644 --- a/tests/tests/telephony/Android.mk +++ b/tests/tests/telephony/Android.mk @@ -36,7 +36,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsTelephonyTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # uncomment when b/13250611 is fixed #LOCAL_SDK_VERSION := current diff --git a/tests/tests/telephony/preconditions/Android.mk b/tests/tests/telephony/preconditions/Android.mk index 6577932edcf..1b49e7e8833 100644 --- a/tests/tests/telephony/preconditions/Android.mk +++ b/tests/tests/telephony/preconditions/Android.mk @@ -25,7 +25,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := compatibility-host-telephony-preconditions # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/telephony/preconditions/app/Android.mk b/tests/tests/telephony/preconditions/app/Android.mk index 349daeda773..72cbbce162e 100644 --- a/tests/tests/telephony/preconditions/app/Android.mk +++ b/tests/tests/telephony/preconditions/app/Android.mk @@ -32,7 +32,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ctstestrunner \ compatibility-device-preconditions # tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsTelephonyPreparerApp diff --git a/tests/tests/telephony2/Android.mk b/tests/tests/telephony2/Android.mk index 3ba60188d97..bae1dfa9742 100644 --- a/tests/tests/telephony2/Android.mk +++ b/tests/tests/telephony2/Android.mk @@ -32,7 +32,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsTelephony2TestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_JAVA_LIBRARIES += android.test.runner diff --git a/tests/tests/text/Android.mk b/tests/tests/text/Android.mk index 2210cbde323..1243052ca24 100644 --- a/tests/tests/text/Android.mk +++ b/tests/tests/text/Android.mk @@ -35,7 +35,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsTextTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # uncomment when dalvik.annotation.Test* are removed or part of SDK #LOCAL_SDK_VERSION := current diff --git a/tests/tests/theme/Android.mk b/tests/tests/theme/Android.mk index 0f370d0046e..f68a3547f70 100644 --- a/tests/tests/theme/Android.mk +++ b/tests/tests/theme/Android.mk @@ -29,7 +29,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/toast/Android.mk b/tests/tests/toast/Android.mk index d9f15ebb174..cb8fe990816 100644 --- a/tests/tests/toast/Android.mk +++ b/tests/tests/toast/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner android-support-test diff --git a/tests/tests/toastlegacy/Android.mk b/tests/tests/toastlegacy/Android.mk index ac5825d234c..96916a3a751 100644 --- a/tests/tests/toastlegacy/Android.mk +++ b/tests/tests/toastlegacy/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner android-support-test diff --git a/tests/tests/transition/Android.mk b/tests/tests/transition/Android.mk index a80f43c6275..5646499fb94 100644 --- a/tests/tests/transition/Android.mk +++ b/tests/tests/transition/Android.mk @@ -37,6 +37,6 @@ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/tv/Android.mk b/tests/tests/tv/Android.mk index 640e16e7e2b..66b35a1b5b8 100644 --- a/tests/tests/tv/Android.mk +++ b/tests/tests/tv/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/tests/tests/uiautomation/Android.mk b/tests/tests/uiautomation/Android.mk index c595635f1fd..b2a0ba1c304 100644 --- a/tests/tests/uiautomation/Android.mk +++ b/tests/tests/uiautomation/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ub-uiautomator diff --git a/tests/tests/uidisolation/Android.mk b/tests/tests/uidisolation/Android.mk index 08b964648ef..67303f3a310 100644 --- a/tests/tests/uidisolation/Android.mk +++ b/tests/tests/uidisolation/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctstestserver diff --git a/tests/tests/uirendering/Android.mk b/tests/tests/uirendering/Android.mk index 956a673948c..56e01ed583f 100644 --- a/tests/tests/uirendering/Android.mk +++ b/tests/tests/uirendering/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_JAVA_LIBRARIES := android.test.runner diff --git a/tests/tests/util/Android.mk b/tests/tests/util/Android.mk index 32d4584cd2e..3ceeaddeca3 100644 --- a/tests/tests/util/Android.mk +++ b/tests/tests/util/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-annotations \ diff --git a/tests/tests/view/Android.mk b/tests/tests/view/Android.mk index f582b41192e..a50b42ff548 100644 --- a/tests/tests/view/Android.mk +++ b/tests/tests/view/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_MULTILIB := both diff --git a/tests/tests/voiceinteraction/Android.mk b/tests/tests/voiceinteraction/Android.mk index cbb874afe9f..67cbf3d941a 100644 --- a/tests/tests/voiceinteraction/Android.mk +++ b/tests/tests/voiceinteraction/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsVoiceInteractionTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/voiceinteraction/service/Android.mk b/tests/tests/voiceinteraction/service/Android.mk index b8d3aa83f15..c274e85dc23 100644 --- a/tests/tests/voiceinteraction/service/Android.mk +++ b/tests/tests/voiceinteraction/service/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsVoiceInteractionService # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/voiceinteraction/testapp/Android.mk b/tests/tests/voiceinteraction/testapp/Android.mk index aa40e53e98b..79e0fbd1735 100644 --- a/tests/tests/voiceinteraction/testapp/Android.mk +++ b/tests/tests/voiceinteraction/testapp/Android.mk @@ -30,6 +30,6 @@ LOCAL_PACKAGE_NAME := CtsVoiceInteractionApp 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_SUPPORT_PACKAGE) diff --git a/tests/tests/voicesettings/Android.mk b/tests/tests/voicesettings/Android.mk index c554470482d..926547b79b8 100644 --- a/tests/tests/voicesettings/Android.mk +++ b/tests/tests/voicesettings/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsVoiceSettingsTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/voicesettings/service/Android.mk b/tests/tests/voicesettings/service/Android.mk index 6f246bd31ed..ad008a55583 100644 --- a/tests/tests/voicesettings/service/Android.mk +++ b/tests/tests/voicesettings/service/Android.mk @@ -28,7 +28,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsVoiceSettingsService # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/tests/webkit/Android.mk b/tests/tests/webkit/Android.mk index 2385647a459..43f1bba5be0 100644 --- a/tests/tests/webkit/Android.mk +++ b/tests/tests/webkit/Android.mk @@ -34,7 +34,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsWebkitTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests # uncomment when dalvik.annotation.Test* are removed or part of SDK #LOCAL_SDK_VERSION := current diff --git a/tests/tests/widget/Android.mk b/tests/tests/widget/Android.mk index c6d85c6d034..653ef771180 100644 --- a/tests/tests/widget/Android.mk +++ b/tests/tests/widget/Android.mk @@ -37,6 +37,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsWidgetTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tests/tests/wrap/nowrap/Android.mk b/tests/tests/wrap/nowrap/Android.mk index 81d315fc363..bff3f4a2413 100644 --- a/tests/tests/wrap/nowrap/Android.mk +++ b/tests/tests/wrap/nowrap/Android.mk @@ -23,7 +23,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test LOCAL_SRC_FILES := $(call all-java-files-under, ../src) -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := CtsWrapNoWrapTestCases diff --git a/tests/tests/wrap/wrap_debug/Android.mk b/tests/tests/wrap/wrap_debug/Android.mk index 2bfb7a55bdd..7f926a86f34 100644 --- a/tests/tests/wrap/wrap_debug/Android.mk +++ b/tests/tests/wrap/wrap_debug/Android.mk @@ -23,7 +23,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test LOCAL_SRC_FILES := $(call all-java-files-under, ../src) -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current LOCAL_PREBUILT_JNI_LIBS_arm := ../wrap.sh diff --git a/tests/tests/wrap/wrap_nodebug/Android.mk b/tests/tests/wrap/wrap_nodebug/Android.mk index 799030d0507..7f4e0540a09 100644 --- a/tests/tests/wrap/wrap_nodebug/Android.mk +++ b/tests/tests/wrap/wrap_nodebug/Android.mk @@ -23,7 +23,7 @@ LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test LOCAL_SRC_FILES := $(call all-java-files-under, ../src) -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current LOCAL_PREBUILT_JNI_LIBS_arm := ../wrap.sh diff --git a/tests/tvprovider/Android.mk b/tests/tvprovider/Android.mk index 2ac45a2b51c..8c5aa1e72a0 100644 --- a/tests/tvprovider/Android.mk +++ b/tests/tvprovider/Android.mk @@ -25,7 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsTvProviderTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/ui/Android.mk b/tests/ui/Android.mk index 0ad32d1b49b..172f6f5d063 100644 --- a/tests/ui/Android.mk +++ b/tests/ui/Android.mk @@ -27,7 +27,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsUiDeviceTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := 16 diff --git a/tests/video/Android.mk b/tests/video/Android.mk index d7b91d9d03c..ca55138d490 100644 --- a/tests/video/Android.mk +++ b/tests/video/Android.mk @@ -32,7 +32,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsVideoTestCases # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_SDK_VERSION := current diff --git a/tests/vm/Android.mk b/tests/vm/Android.mk index ed28a374b75..574ad163159 100755 --- a/tests/vm/Android.mk +++ b/tests/vm/Android.mk @@ -30,7 +30,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsVmTestCases diff --git a/tests/vr/Android.mk b/tests/vr/Android.mk index 92c99b182d4..818bdc1563b 100644 --- a/tests/vr/Android.mk +++ b/tests/vr/Android.mk @@ -34,6 +34,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) ../../apps/CtsVerifier/src/ LOCAL_SDK_VERSION := test_current # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_PACKAGE) diff --git a/tools/cts-device-info/Android.mk b/tools/cts-device-info/Android.mk index 81c8cafd385..d87ca41418a 100644 --- a/tools/cts-device-info/Android.mk +++ b/tools/cts-device-info/Android.mk @@ -36,7 +36,7 @@ DEVICE_INFO_ACTIVITIES := \ LOCAL_PACKAGE_NAME := CtsDeviceInfo # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_CTS_DEVICE_INFO_PACKAGE) diff --git a/tools/cts-preconditions/Android.mk b/tools/cts-preconditions/Android.mk index 5497dda8da9..ad853018728 100644 --- a/tools/cts-preconditions/Android.mk +++ b/tools/cts-preconditions/Android.mk @@ -30,7 +30,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-precond LOCAL_SRC_FILES := $(call all-java-files-under, src) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests LOCAL_PACKAGE_NAME := CtsPreconditions diff --git a/tools/vm-tests-tf/Android.mk b/tools/vm-tests-tf/Android.mk index d5811c346d7..d367f658310 100644 --- a/tools/vm-tests-tf/Android.mk +++ b/tools/vm-tests-tf/Android.mk @@ -68,7 +68,7 @@ LOCAL_INSTALLED_MODULE_STEM := android.core.vm-tests-tf.jar LOCAL_MODULE_PATH := $(intermediates) # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_SYSTEM)/base_rules.mk diff --git a/tools/vm-tests-tf/targetprep/Android.mk b/tools/vm-tests-tf/targetprep/Android.mk index a05b6583e65..b87b08aeea0 100644 --- a/tools/vm-tests-tf/targetprep/Android.mk +++ b/tools/vm-tests-tf/targetprep/Android.mk @@ -25,7 +25,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := compatibility-host-vm-targetprep # Tag this module as a cts test artifact -LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_COMPATIBILITY_SUITE := cts general-tests include $(BUILD_HOST_JAVA_LIBRARY) |