Add vts10 suite to existing vts tests
This is to prepare renaming vts to vts10.
Bug: 151896491
Test: local build
Exempt-From-Owner-Approval: This CL adds all tests in vts to a new
suite vts10. vts10 will be the new name of existing vts suite. This CL
won't change test logic or behavior.
Change-Id: Ia9af1fbddc66d3c94976a58c36d274425f1fe461
diff --git a/hostsidetests/abioverride/Android.bp b/hostsidetests/abioverride/Android.bp
index 7717acc..ad27517 100644
--- a/hostsidetests/abioverride/Android.bp
+++ b/hostsidetests/abioverride/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/abioverride/app/Android.bp b/hostsidetests/abioverride/app/Android.bp
index 12923c0..3561d7a 100644
--- a/hostsidetests/abioverride/app/Android.bp
+++ b/hostsidetests/abioverride/app/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/accounts/Android.bp b/hostsidetests/accounts/Android.bp
index 3bf3334..38669eb 100644
--- a/hostsidetests/accounts/Android.bp
+++ b/hostsidetests/accounts/Android.bp
@@ -28,6 +28,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/accounts/test-apps/AccountManagerCrossUserApp/Android.bp b/hostsidetests/accounts/test-apps/AccountManagerCrossUserApp/Android.bp
index 9eb425f..d9f434a 100644
--- a/hostsidetests/accounts/test-apps/AccountManagerCrossUserApp/Android.bp
+++ b/hostsidetests/accounts/test-apps/AccountManagerCrossUserApp/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/accounts/test-apps/Android.mk b/hostsidetests/accounts/test-apps/Android.mk
index 7280aab..2061de1 100644
--- a/hostsidetests/accounts/test-apps/Android.mk
+++ b/hostsidetests/accounts/test-apps/Android.mk
@@ -17,7 +17,7 @@
include $(CLEAR_VARS)
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests
# Build the test APKs using their own makefiles
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/angle/Android.bp b/hostsidetests/angle/Android.bp
index 1013607..e8dbed0 100644
--- a/hostsidetests/angle/Android.bp
+++ b/hostsidetests/angle/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
"mts"
],
diff --git a/hostsidetests/angle/app/driverTest/Android.bp b/hostsidetests/angle/app/driverTest/Android.bp
index 986824d..bf00b76 100644
--- a/hostsidetests/angle/app/driverTest/Android.bp
+++ b/hostsidetests/angle/app/driverTest/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"mts"
],
compile_multilib: "both",
diff --git a/hostsidetests/angle/app/driverTestSecondary/Android.bp b/hostsidetests/angle/app/driverTestSecondary/Android.bp
index 45fba06..7ea1fce 100644
--- a/hostsidetests/angle/app/driverTestSecondary/Android.bp
+++ b/hostsidetests/angle/app/driverTestSecondary/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"mts"
],
compile_multilib: "both",
diff --git a/hostsidetests/appbinding/app/Android.bp b/hostsidetests/appbinding/app/Android.bp
index 58deb2f..7c1c04b 100644
--- a/hostsidetests/appbinding/app/Android.bp
+++ b/hostsidetests/appbinding/app/Android.bp
@@ -46,6 +46,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -61,6 +62,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -76,6 +78,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -91,6 +94,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -105,6 +109,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -120,6 +125,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -135,6 +141,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appbinding/hostside/Android.bp b/hostsidetests/appbinding/hostside/Android.bp
index 85eb736..b1b4316 100644
--- a/hostsidetests/appbinding/hostside/Android.bp
+++ b/hostsidetests/appbinding/hostside/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
target_required: [
diff --git a/hostsidetests/appcompat/compatchanges/Android.bp b/hostsidetests/appcompat/compatchanges/Android.bp
index 85fb5bb..425881d 100644
--- a/hostsidetests/appcompat/compatchanges/Android.bp
+++ b/hostsidetests/appcompat/compatchanges/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
java_resources: [":cts-global-compat-config"],
diff --git a/hostsidetests/appcompat/compatchanges/app/Android.bp b/hostsidetests/appcompat/compatchanges/app/Android.bp
index 9ff5b17..f6788bf 100644
--- a/hostsidetests/appcompat/compatchanges/app/Android.bp
+++ b/hostsidetests/appcompat/compatchanges/app/Android.bp
@@ -31,6 +31,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/Android.mk b/hostsidetests/appsecurity/Android.mk
index 55d7720..b5f2774 100644
--- a/hostsidetests/appsecurity/Android.mk
+++ b/hostsidetests/appsecurity/Android.mk
@@ -36,7 +36,7 @@
LOCAL_CTS_TEST_PACKAGE := android.appsecurity
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests mts sts
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests mts sts
LOCAL_REQUIRED_MODULES := \
CtsCorruptApkTests_b71360999 \
diff --git a/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/Android.bp b/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/Android.bp
index a236664..a59acb4 100644
--- a/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AccessSerialLegacy/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.bp b/hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.bp
index 747a5d9..4a4d90c 100644
--- a/hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/appsecurity/test-apps/Android.mk b/hostsidetests/appsecurity/test-apps/Android.mk
index 24249f2..3eba1f9 100644
--- a/hostsidetests/appsecurity/test-apps/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/Android.mk
@@ -17,7 +17,7 @@
include $(CLEAR_VARS)
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests sts
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests sts
# Build the test APKs using their own makefiles
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/appsecurity/test-apps/AppAccessData/Android.bp b/hostsidetests/appsecurity/test-apps/AppAccessData/Android.bp
index 2c3960a..1c76741 100644
--- a/hostsidetests/appsecurity/test-apps/AppAccessData/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AppAccessData/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
// although not strictly necessary, sign this app with different cert than CtsAppWithData
diff --git a/hostsidetests/appsecurity/test-apps/AppDataIsolationTestApp/Android.bp b/hostsidetests/appsecurity/test-apps/AppDataIsolationTestApp/Android.bp
index e415ec7..0f4e251 100644
--- a/hostsidetests/appsecurity/test-apps/AppDataIsolationTestApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AppDataIsolationTestApp/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
@@ -43,6 +44,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
@@ -63,6 +65,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
@@ -83,6 +86,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
@@ -103,6 +107,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/AppWithData/Android.bp b/hostsidetests/appsecurity/test-apps/AppWithData/Android.bp
index 2b59838..6d205de 100644
--- a/hostsidetests/appsecurity/test-apps/AppWithData/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AppWithData/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/Android.bp b/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/Android.bp
index 6c70ccd..e532b30 100644
--- a/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/appsecurity/test-apps/AuthBoundKeyApp/Android.bp b/hostsidetests/appsecurity/test-apps/AuthBoundKeyApp/Android.bp
index 9d392de..516c376 100644
--- a/hostsidetests/appsecurity/test-apps/AuthBoundKeyApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/AuthBoundKeyApp/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
// sign this app with a different cert than CtsUsePermissionDiffCert
diff --git a/hostsidetests/appsecurity/test-apps/CorruptApkTests/Android.bp b/hostsidetests/appsecurity/test-apps/CorruptApkTests/Android.bp
index a6e4f83..0123ccd 100644
--- a/hostsidetests/appsecurity/test-apps/CorruptApkTests/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/CorruptApkTests/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
]
}
@@ -30,6 +31,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
]
}
@@ -41,6 +43,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
]
}
diff --git a/hostsidetests/appsecurity/test-apps/DeviceIdentifiers/Android.bp b/hostsidetests/appsecurity/test-apps/DeviceIdentifiers/Android.bp
index 71129b9..a20fb95 100644
--- a/hostsidetests/appsecurity/test-apps/DeviceIdentifiers/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/DeviceIdentifiers/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/appsecurity/test-apps/DocumentClient/Android.bp b/hostsidetests/appsecurity/test-apps/DocumentClient/Android.bp
index 6f909d8..3dc602a 100644
--- a/hostsidetests/appsecurity/test-apps/DocumentClient/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/DocumentClient/Android.bp
@@ -33,6 +33,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
"mts",
],
diff --git a/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.bp b/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.bp
index 7981db4..8225294 100644
--- a/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.bp
@@ -29,6 +29,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
"mts",
],
diff --git a/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/Android.bp b/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/Android.bp
index 6bc0b8d..a70dca9 100644
--- a/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.bp b/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.bp
index 42a1c3e..b1f23b3 100644
--- a/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.bp
@@ -31,6 +31,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.bp
index f745d17..429677b 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.bp
@@ -32,6 +32,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.bp
index abce8e6..5e1b086 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.bp
@@ -31,6 +31,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.bp
index ae294f8..7b425bd 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.bp
index d715a00..a8c173f 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.bp
index c00a6fc..842318f 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
resource_dirs: ["res"],
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.bp
index 85c3bbf..b9c49e4 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.bp b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.bp
index 42497c1..10448e5 100644
--- a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.bp b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.bp
index b97bf62..14d51a2 100644
--- a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
dex_preopt: {
diff --git a/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.bp b/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.bp
index 1a8c858..174b16e 100644
--- a/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
certificate: ":cts-keyset-test-a",
diff --git a/hostsidetests/appsecurity/test-apps/InstantCookieApp2/Android.bp b/hostsidetests/appsecurity/test-apps/InstantCookieApp2/Android.bp
index 9a71c16..1a79a47 100644
--- a/hostsidetests/appsecurity/test-apps/InstantCookieApp2/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/InstantCookieApp2/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
certificate: ":cts-keyset-test-b",
diff --git a/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/Android.bp b/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/Android.bp
index 411bccc..02f21a8 100644
--- a/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/InstantUpgradeApp/Android.bp
@@ -31,6 +31,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.bp b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.bp
index 9f5d35a..801d619 100644
--- a/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
// sign this app with different cert than CtsTargetInstrumentationApp
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.bp b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.bp
index 91c5be6..80025f0 100644
--- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/Android.bp b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/Android.bp
index b26ce47..363fae8 100644
--- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
// Feature splits are dependent on this split, so it must be exported.
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/Android.bp b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/Android.bp
index 7a32ea9..f14eee2 100644
--- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
// Make sure our test locale polish is not stripped.
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/Android.bp b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/Android.bp
index 3df120d..d44ce9b 100644
--- a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
// Make sure our test locale polish is not stripped.
diff --git a/hostsidetests/appsecurity/test-apps/ListeningPortsApp/Android.bp b/hostsidetests/appsecurity/test-apps/ListeningPortsApp/Android.bp
index 10938de..f36c685 100644
--- a/hostsidetests/appsecurity/test-apps/ListeningPortsApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/ListeningPortsApp/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/Android.bp b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/Android.bp
index 8029df5..cb34819 100644
--- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000000000ffff/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
// sign this app with a different cert than CtsSimpleAppInstallDiffCert
diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/Android.bp b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/Android.bp
index 148d2ee..3891fbd 100644
--- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version00000000ffffffff/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
// sign this app with a different cert than CtsSimpleAppInstallDiffCert
diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/Android.bp b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/Android.bp
index 3efce33..34e11a5 100644
--- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ff00000000/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
// sign this app with a different cert than CtsSimpleAppInstallDiffCert
diff --git a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/Android.bp b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/Android.bp
index d68a767..c9ed3ba 100644
--- a/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MajorVersionApp/Version000000ffffffffff/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
// sign this app with a different cert than CtsSimpleAppInstallDiffCert
diff --git a/hostsidetests/appsecurity/test-apps/MediaStorageApp/Android.bp b/hostsidetests/appsecurity/test-apps/MediaStorageApp/Android.bp
index 1f2b551..b6310bb 100644
--- a/hostsidetests/appsecurity/test-apps/MediaStorageApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MediaStorageApp/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -46,6 +47,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "AndroidManifest28.xml",
@@ -66,6 +68,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "AndroidManifest29.xml",
diff --git a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.bp b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.bp
index fe3990d..c01ce22 100644
--- a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.bp
@@ -28,6 +28,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
dex_preopt: {
diff --git a/hostsidetests/appsecurity/test-apps/NoRestartApp/Android.bp b/hostsidetests/appsecurity/test-apps/NoRestartApp/Android.bp
index dda150a..a967823 100644
--- a/hostsidetests/appsecurity/test-apps/NoRestartApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/NoRestartApp/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
export_package_resources: true,
diff --git a/hostsidetests/appsecurity/test-apps/NoRestartApp/feature/Android.bp b/hostsidetests/appsecurity/test-apps/NoRestartApp/feature/Android.bp
index 9bbdfc9..9ae3cc9 100644
--- a/hostsidetests/appsecurity/test-apps/NoRestartApp/feature/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/NoRestartApp/feature/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: ["CtsNoRestartBase"],
diff --git a/hostsidetests/appsecurity/test-apps/OrderedActivityApp/Android.bp b/hostsidetests/appsecurity/test-apps/OrderedActivityApp/Android.bp
index 2e3b6e9..b7cd088 100644
--- a/hostsidetests/appsecurity/test-apps/OrderedActivityApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/OrderedActivityApp/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.bp b/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.bp
index 7e1137e..05d2f7a 100644
--- a/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.bp b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.bp
index 4c79dca..150a427 100644
--- a/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/PermissionDeclareApp/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
"sts",
],
diff --git a/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.bp b/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.bp
index 76203e9..1b924fd 100644
--- a/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/PermissionDeclareAppCompat/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
"sts",
],
diff --git a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.bp b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.bp
index 61e5d4c..0f2579a 100644
--- a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.bp
@@ -15,6 +15,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
index ef27f50..3d69a2f 100644
--- a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
@@ -12,7 +12,7 @@
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 vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests
# The 'arm' apk has both arm and arm64 so's. Same for x86/x86_64.
my_apk_dir := $(subst arm64,arm,$(TARGET_ARCH))
@@ -32,7 +32,7 @@
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 vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests
LOCAL_REPLACE_PREBUILT_APK_INSTALLED := $(LOCAL_PATH)/apk/$(my_apk_dir)/CtsShimPrivUpgradeWrongSHA.apk
diff --git a/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.bp b/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.bp
index d8acb10..35f30d9 100644
--- a/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.bp
@@ -31,6 +31,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
dex_preopt: {
diff --git a/hostsidetests/appsecurity/test-apps/SessionInspector/Android.bp b/hostsidetests/appsecurity/test-apps/SessionInspector/Android.bp
index 421c9de..aebf608 100644
--- a/hostsidetests/appsecurity/test-apps/SessionInspector/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SessionInspector/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -37,6 +38,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.bp b/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.bp
index 15f04c5..8ce8d71 100644
--- a/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SharedUidInstall/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
// sign this app with a different cert than CtsSharedUidInstallDiffCert
diff --git a/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.bp b/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.bp
index 87a9fce..c97be7d 100644
--- a/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SharedUidInstallDiffCert/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
// sign this app with a different cert than CtsSharedUidInstall
diff --git a/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.bp b/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.bp
index 943165f..f9ceac4 100644
--- a/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SimpleAppInstall/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
// sign this app with a different cert than CtsSimpleAppInstallDiffCert
diff --git a/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.bp b/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.bp
index 64005a0..d30837a 100644
--- a/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SimpleAppInstallDiffCert/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
// sign this app with a different cert than CtsSimpleAppInstall
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
index 59482af..eaf8f0e 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
@@ -31,7 +31,7 @@
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 vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests
LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets
@@ -64,7 +64,7 @@
LOCAL_PACKAGE_SPLITS := v7
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests
LOCAL_MANIFEST_FILE := revision/AndroidManifest.xml
LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
@@ -94,7 +94,7 @@
LOCAL_PACKAGE_SPLITS := v7
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests
LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
LOCAL_AAPT_FLAGS := --version-code 101 --version-name OneHundredOne --replace-version
@@ -123,7 +123,7 @@
LOCAL_PACKAGE_SPLITS := v7
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests
LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2
LOCAL_AAPT_FLAGS := --version-code 100 --version-name OneHundred --replace-version
@@ -150,7 +150,7 @@
LOCAL_MIN_SDK_VERSION := 4
LOCAL_PACKAGE_SPLITS := xxhdpi-v4
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests
LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/feature/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/feature/Android.mk
index 0a8a99a..29570cf 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/feature/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/feature/Android.mk
@@ -31,7 +31,7 @@
LOCAL_MODULE_TAGS := tests
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests
LOCAL_USE_AAPT2 := true
LOCAL_APK_LIBRARIES := CtsSplitApp
@@ -56,7 +56,7 @@
LOCAL_SDK_VERSION := current
LOCAL_MIN_SDK_VERSION := 4
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests
LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/jni/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/jni/Android.mk
index fbc7143..7fa6046 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/jni/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/jni/Android.mk
@@ -24,6 +24,6 @@
LOCAL_LDLIBS += -llog
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 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 5337057..cd88994 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/arm64-v8a/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/arm64-v8a/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_RESOURCE_DIRS := raw
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 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 7fceede..954e6de 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi-v7a/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi-v7a/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_RESOURCE_DIRS := raw
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 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 9149930..01767bb 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/armeabi/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_RESOURCE_DIRS := raw
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 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 95d02d0..ffb5109 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_RESOURCE_DIRS := raw
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 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 ad10be0..d364d96 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips64/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/mips64/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_RESOURCE_DIRS := raw
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 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 f008564..9155ad4 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_RESOURCE_DIRS := raw
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 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 ded5b29..79b9726 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86_64/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/libs/x86_64/Android.mk
@@ -24,7 +24,7 @@
LOCAL_JAVA_RESOURCE_DIRS := raw
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 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/StorageApp/Android.bp b/hostsidetests/appsecurity/test-apps/StorageApp/Android.bp
index a110513..ae88857 100644
--- a/hostsidetests/appsecurity/test-apps/StorageApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/StorageApp/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "AndroidManifestA.xml",
@@ -40,6 +41,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "AndroidManifestB.xml",
diff --git a/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.bp b/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.bp
index 9017af5..b949f18 100644
--- a/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.bp
@@ -28,6 +28,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
dex_preopt: {
diff --git a/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.bp b/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.bp
index 8085465..dd48f86 100644
--- a/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/TargetInstrumentationApp/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
// sign this app with different cert than CtsInstrumentationAppDiffCert
diff --git a/hostsidetests/appsecurity/test-apps/UseEmbeddedDexApp/Android.bp b/hostsidetests/appsecurity/test-apps/UseEmbeddedDexApp/Android.bp
index 4c605e1..2c84c59 100644
--- a/hostsidetests/appsecurity/test-apps/UseEmbeddedDexApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UseEmbeddedDexApp/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -38,6 +39,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -52,6 +54,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -70,6 +73,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -84,6 +88,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.bp b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.bp
index cbedea9..8334f32 100644
--- a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.bp
@@ -28,6 +28,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
"sts",
],
diff --git a/hostsidetests/appsecurity/test-apps/UseProcessFailActivity/Android.bp b/hostsidetests/appsecurity/test-apps/UseProcessFailActivity/Android.bp
index 4b8d944..d1bf39e 100644
--- a/hostsidetests/appsecurity/test-apps/UseProcessFailActivity/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UseProcessFailActivity/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/UseProcessFailApplication/Android.bp b/hostsidetests/appsecurity/test-apps/UseProcessFailApplication/Android.bp
index 0a86b6b..11b81b2 100644
--- a/hostsidetests/appsecurity/test-apps/UseProcessFailApplication/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UseProcessFailApplication/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/UseProcessFailProvider/Android.bp b/hostsidetests/appsecurity/test-apps/UseProcessFailProvider/Android.bp
index 2969503..ba7328a 100644
--- a/hostsidetests/appsecurity/test-apps/UseProcessFailProvider/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UseProcessFailProvider/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/UseProcessFailReceiver/Android.bp b/hostsidetests/appsecurity/test-apps/UseProcessFailReceiver/Android.bp
index f5c1532..ae60cb7 100644
--- a/hostsidetests/appsecurity/test-apps/UseProcessFailReceiver/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UseProcessFailReceiver/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/UseProcessFailService/Android.bp b/hostsidetests/appsecurity/test-apps/UseProcessFailService/Android.bp
index 91765ae..2a309a9 100644
--- a/hostsidetests/appsecurity/test-apps/UseProcessFailService/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UseProcessFailService/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/UseProcessSuccess/Android.bp b/hostsidetests/appsecurity/test-apps/UseProcessSuccess/Android.bp
index b3c8a45..6b3e7de 100644
--- a/hostsidetests/appsecurity/test-apps/UseProcessSuccess/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/UseProcessSuccess/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
certificate: ":cts-testkey1",
diff --git a/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/Android.bp b/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/Android.bp
index 9de8251..5507715 100644
--- a/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
"sts",
],
diff --git a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.bp b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.bp
index 660ab53..11f3fa1 100644
--- a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.bp
@@ -31,6 +31,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp2/Android.bp b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp2/Android.bp
index f45a3ff..e4bc752 100644
--- a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp2/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp2/Android.bp
@@ -29,6 +29,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/dummyime/Android.bp b/hostsidetests/appsecurity/test-apps/dummyime/Android.bp
index 948e837..d12d67f 100644
--- a/hostsidetests/appsecurity/test-apps/dummyime/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/dummyime/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
"mts",
],
diff --git a/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.bp
index a7a89fd..ada5abe 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/malBadKey/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.bp
index 77a7e8d..cba1470 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/malNoDef/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.bp
index fed13ff..abea10f 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/malOneDef/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.bp
index 1ca7814..cc1e730 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/permDef/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -44,6 +45,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.bp
index 8171ac2..5fb06d1 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/permUse/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -44,6 +45,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.bp
index 2ed9a96..8b70ab6 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uA/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uA/Android.bp
index c6d340e..4998228 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uA/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uA/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -44,6 +45,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -62,6 +64,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -81,6 +84,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.bp
index f8c37af..132ef0f 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uAB/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.bp
index 5094978..ed709e3 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uAuB/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uB/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uB/Android.bp
index 3691f76..5d12f0e 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uB/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uB/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -44,6 +45,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -63,6 +65,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.bp
index 9ad20b6..22a7f87 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uBsharedUser/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -44,6 +45,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.bp
index a6e731b..6bf7563 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uEcA/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.bp b/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.bp
index 6941217..6b53d05 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/keysets/uNone/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayAll/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayAll/Android.bp
index 11dea0f..dea69fb 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayAll/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayAll/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -36,6 +37,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -49,6 +51,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -62,6 +65,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayAndroid/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayAndroid/Android.bp
index 748949e..4148a56 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayAndroid/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayAndroid/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayApp/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayApp/Android.bp
index c9a5584..4e34ffa 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayApp/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyProduct/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyProduct/Android.bp
index 01c909a..8dfb565 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyProduct/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyProduct/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySignatureDifferent/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySignatureDifferent/Android.bp
index ac6acc1..2c53ede 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySignatureDifferent/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySignatureDifferent/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySystem/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySystem/Android.bp
index ed4f41b..5364ff6 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySystem/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicySystem/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyVendor/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyVendor/Android.bp
index 3e46df9..8b044f6 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyVendor/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayPolicyVendor/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp
index a906453..a4c12a3 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -41,6 +42,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/appsecurity/test-apps/tinyapp/Android.bp b/hostsidetests/appsecurity/test-apps/tinyapp/Android.bp
index 64aa2a5..dd78f19 100644
--- a/hostsidetests/appsecurity/test-apps/tinyapp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/tinyapp/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/atrace/Android.bp b/hostsidetests/atrace/Android.bp
index 5e3cf77..09d9bca 100644
--- a/hostsidetests/atrace/Android.bp
+++ b/hostsidetests/atrace/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/atrace/AtraceTestApp/Android.bp b/hostsidetests/atrace/AtraceTestApp/Android.bp
index 169ccbb..e018195 100644
--- a/hostsidetests/atrace/AtraceTestApp/Android.bp
+++ b/hostsidetests/atrace/AtraceTestApp/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/backup/AllowBackup/BackupAllowedApp/Android.bp b/hostsidetests/backup/AllowBackup/BackupAllowedApp/Android.bp
index 1f7fb9a4..cafe920 100644
--- a/hostsidetests/backup/AllowBackup/BackupAllowedApp/Android.bp
+++ b/hostsidetests/backup/AllowBackup/BackupAllowedApp/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/AllowBackup/BackupNotAllowedApp/Android.bp b/hostsidetests/backup/AllowBackup/BackupNotAllowedApp/Android.bp
index a8e2fa3..3b3fea3 100644
--- a/hostsidetests/backup/AllowBackup/BackupNotAllowedApp/Android.bp
+++ b/hostsidetests/backup/AllowBackup/BackupNotAllowedApp/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/Android.bp b/hostsidetests/backup/Android.bp
index 98a36e0..86fc3e9 100644
--- a/hostsidetests/backup/Android.bp
+++ b/hostsidetests/backup/Android.bp
@@ -20,6 +20,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/backup/AutoRestoreApp/Android.bp b/hostsidetests/backup/AutoRestoreApp/Android.bp
index 227fe13..4b6a823 100644
--- a/hostsidetests/backup/AutoRestoreApp/Android.bp
+++ b/hostsidetests/backup/AutoRestoreApp/Android.bp
@@ -28,6 +28,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
platform_apis: true,
diff --git a/hostsidetests/backup/BackupTransportApp/Android.bp b/hostsidetests/backup/BackupTransportApp/Android.bp
index 240a460..930f113 100644
--- a/hostsidetests/backup/BackupTransportApp/Android.bp
+++ b/hostsidetests/backup/BackupTransportApp/Android.bp
@@ -27,6 +27,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "system_current",
diff --git a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseNoAgentApp/Android.bp b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseNoAgentApp/Android.bp
index f14e5d0..645ff86 100644
--- a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseNoAgentApp/Android.bp
+++ b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseNoAgentApp/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseWithAgentApp/Android.bp b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseWithAgentApp/Android.bp
index 01e25ef..0cbb7d5 100644
--- a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseWithAgentApp/Android.bp
+++ b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyFalseWithAgentApp/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyTrueWithAgentApp/Android.bp b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyTrueWithAgentApp/Android.bp
index 8fb4b4b..5094b1a 100644
--- a/hostsidetests/backup/FullBackupOnly/FullBackupOnlyTrueWithAgentApp/Android.bp
+++ b/hostsidetests/backup/FullBackupOnly/FullBackupOnlyTrueWithAgentApp/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/KeyValueApp/Android.bp b/hostsidetests/backup/KeyValueApp/Android.bp
index 7a48b75..1081acd 100644
--- a/hostsidetests/backup/KeyValueApp/Android.bp
+++ b/hostsidetests/backup/KeyValueApp/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
platform_apis: true,
diff --git a/hostsidetests/backup/OtherSoundsSettingsApp/Android.bp b/hostsidetests/backup/OtherSoundsSettingsApp/Android.bp
index e34b256..8bcf99f 100644
--- a/hostsidetests/backup/OtherSoundsSettingsApp/Android.bp
+++ b/hostsidetests/backup/OtherSoundsSettingsApp/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
// Uncomment when b/78787392 is fixed
diff --git a/hostsidetests/backup/PreservedSettingsApp/Android.bp b/hostsidetests/backup/PreservedSettingsApp/Android.bp
index 9a4de9e..780864a 100644
--- a/hostsidetests/backup/PreservedSettingsApp/Android.bp
+++ b/hostsidetests/backup/PreservedSettingsApp/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
],
// Uncomment when b/78787392 is fixed
// sdk_version: "system_test_current",
diff --git a/hostsidetests/backup/ProfileFullBackupApp/Android.bp b/hostsidetests/backup/ProfileFullBackupApp/Android.bp
index c5d7dd1..a1c81f1 100644
--- a/hostsidetests/backup/ProfileFullBackupApp/Android.bp
+++ b/hostsidetests/backup/ProfileFullBackupApp/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/ProfileKeyValueApp/Android.bp b/hostsidetests/backup/ProfileKeyValueApp/Android.bp
index df6b009..a7b6d59 100644
--- a/hostsidetests/backup/ProfileKeyValueApp/Android.bp
+++ b/hostsidetests/backup/ProfileKeyValueApp/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/backup/ProfileSerialNumberApp/Android.bp b/hostsidetests/backup/ProfileSerialNumberApp/Android.bp
index d8713cc..112ccb1 100644
--- a/hostsidetests/backup/ProfileSerialNumberApp/Android.bp
+++ b/hostsidetests/backup/ProfileSerialNumberApp/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
],
// Uncomment when b/78787392 is fixed
// sdk_version: "system_test_current",
diff --git a/hostsidetests/backup/RestoreAnyVersion/NewVersionApp/Android.bp b/hostsidetests/backup/RestoreAnyVersion/NewVersionApp/Android.bp
index 5f536c3..14e49d4 100644
--- a/hostsidetests/backup/RestoreAnyVersion/NewVersionApp/Android.bp
+++ b/hostsidetests/backup/RestoreAnyVersion/NewVersionApp/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/RestoreAnyVersion/NoRestoreAnyVersionApp/Android.bp b/hostsidetests/backup/RestoreAnyVersion/NoRestoreAnyVersionApp/Android.bp
index 587ffb9..34291ae 100644
--- a/hostsidetests/backup/RestoreAnyVersion/NoRestoreAnyVersionApp/Android.bp
+++ b/hostsidetests/backup/RestoreAnyVersion/NoRestoreAnyVersionApp/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/RestoreAnyVersion/RestoreAnyVersionApp/Android.bp b/hostsidetests/backup/RestoreAnyVersion/RestoreAnyVersionApp/Android.bp
index c7c63fe..65e2eae 100644
--- a/hostsidetests/backup/RestoreAnyVersion/RestoreAnyVersionApp/Android.bp
+++ b/hostsidetests/backup/RestoreAnyVersion/RestoreAnyVersionApp/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/RestoreSessionTest/Android.bp b/hostsidetests/backup/RestoreSessionTest/Android.bp
index a3ac883..80b57af 100644
--- a/hostsidetests/backup/RestoreSessionTest/Android.bp
+++ b/hostsidetests/backup/RestoreSessionTest/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "system_current",
diff --git a/hostsidetests/backup/SharedPreferencesRestoreApp/Android.bp b/hostsidetests/backup/SharedPreferencesRestoreApp/Android.bp
index 24131cc..0226e10 100644
--- a/hostsidetests/backup/SharedPreferencesRestoreApp/Android.bp
+++ b/hostsidetests/backup/SharedPreferencesRestoreApp/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
],
sdk_version: "current",
}
diff --git a/hostsidetests/backup/SuccessNotificationApp/Android.bp b/hostsidetests/backup/SuccessNotificationApp/Android.bp
index f4ff7e0..b897c58 100644
--- a/hostsidetests/backup/SuccessNotificationApp/Android.bp
+++ b/hostsidetests/backup/SuccessNotificationApp/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
],
sdk_version: "current",
}
diff --git a/hostsidetests/backup/SyncAdapterSettingsApp/Android.bp b/hostsidetests/backup/SyncAdapterSettingsApp/Android.bp
index 290c350..c6c1294 100644
--- a/hostsidetests/backup/SyncAdapterSettingsApp/Android.bp
+++ b/hostsidetests/backup/SyncAdapterSettingsApp/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/backup/fullbackupapp/Android.bp b/hostsidetests/backup/fullbackupapp/Android.bp
index a1926d0..b554aee 100644
--- a/hostsidetests/backup/fullbackupapp/Android.bp
+++ b/hostsidetests/backup/fullbackupapp/Android.bp
@@ -25,6 +25,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/includeexcludeapp/Android.bp b/hostsidetests/backup/includeexcludeapp/Android.bp
index 5093888..e494d79 100644
--- a/hostsidetests/backup/includeexcludeapp/Android.bp
+++ b/hostsidetests/backup/includeexcludeapp/Android.bp
@@ -25,6 +25,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/backup/restoresessionapp1/Android.bp b/hostsidetests/backup/restoresessionapp1/Android.bp
index 2eb5d0e..2aa678a 100644
--- a/hostsidetests/backup/restoresessionapp1/Android.bp
+++ b/hostsidetests/backup/restoresessionapp1/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
],
sdk_version: "system_current",
}
diff --git a/hostsidetests/backup/restoresessionapp2/Android.bp b/hostsidetests/backup/restoresessionapp2/Android.bp
index e389054..c44b77b 100644
--- a/hostsidetests/backup/restoresessionapp2/Android.bp
+++ b/hostsidetests/backup/restoresessionapp2/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
],
sdk_version: "system_current",
}
diff --git a/hostsidetests/backup/restoresessionapp3/Android.bp b/hostsidetests/backup/restoresessionapp3/Android.bp
index 1451823..97501eb 100644
--- a/hostsidetests/backup/restoresessionapp3/Android.bp
+++ b/hostsidetests/backup/restoresessionapp3/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
],
sdk_version: "system_current",
}
diff --git a/hostsidetests/blobstore/Android.bp b/hostsidetests/blobstore/Android.bp
index 2baec7f..b4c8600 100644
--- a/hostsidetests/blobstore/Android.bp
+++ b/hostsidetests/blobstore/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests"
]
}
@@ -47,6 +48,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests"
]
}
diff --git a/hostsidetests/bootstats/Android.bp b/hostsidetests/bootstats/Android.bp
index 07f9c84..a302c1b 100644
--- a/hostsidetests/bootstats/Android.bp
+++ b/hostsidetests/bootstats/Android.bp
@@ -28,6 +28,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/classloaders/splits/Android.bp b/hostsidetests/classloaders/splits/Android.bp
index 592bbc3..78d60c9 100644
--- a/hostsidetests/classloaders/splits/Android.bp
+++ b/hostsidetests/classloaders/splits/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
required: [
diff --git a/hostsidetests/classloaders/useslibrary/Android.bp b/hostsidetests/classloaders/useslibrary/Android.bp
index 970f93b..31de742 100644
--- a/hostsidetests/classloaders/useslibrary/Android.bp
+++ b/hostsidetests/classloaders/useslibrary/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
required: [ "CtsUsesLibraryApp" ],
diff --git a/hostsidetests/compilation/Android.bp b/hostsidetests/compilation/Android.bp
index 4402ed6..d668c62 100644
--- a/hostsidetests/compilation/Android.bp
+++ b/hostsidetests/compilation/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/compilation/app/Android.bp b/hostsidetests/compilation/app/Android.bp
index 770baea..360125b 100644
--- a/hostsidetests/compilation/app/Android.bp
+++ b/hostsidetests/compilation/app/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/content/Android.bp b/hostsidetests/content/Android.bp
index 4478035..5ef8eb8 100644
--- a/hostsidetests/content/Android.bp
+++ b/hostsidetests/content/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileApp/Android.bp b/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileApp/Android.bp
index 06d5b40..275e314 100644
--- a/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileApp/Android.bp
+++ b/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileApp/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileTestServiceApp/Android.bp b/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileTestServiceApp/Android.bp
index 7b93470..ced0a19 100644
--- a/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileTestServiceApp/Android.bp
+++ b/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileTestServiceApp/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/Android.bp b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/Android.bp
index 5a91da1..2412639 100644
--- a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/Android.bp
+++ b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/cpptools/Android.bp b/hostsidetests/cpptools/Android.bp
index 208e734..9c07d7b 100644
--- a/hostsidetests/cpptools/Android.bp
+++ b/hostsidetests/cpptools/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/cpptools/test-apps/BasicApp/Android.bp b/hostsidetests/cpptools/test-apps/BasicApp/Android.bp
index f96f5a5..fced0ac 100644
--- a/hostsidetests/cpptools/test-apps/BasicApp/Android.bp
+++ b/hostsidetests/cpptools/test-apps/BasicApp/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/cpptools/test-apps/ConnectorNativeProgram/Android.bp b/hostsidetests/cpptools/test-apps/ConnectorNativeProgram/Android.bp
index 832725c..bdbf984 100644
--- a/hostsidetests/cpptools/test-apps/ConnectorNativeProgram/Android.bp
+++ b/hostsidetests/cpptools/test-apps/ConnectorNativeProgram/Android.bp
@@ -32,6 +32,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/cpptools/test-apps/DomainSocketApp/Android.bp b/hostsidetests/cpptools/test-apps/DomainSocketApp/Android.bp
index d4dab8b..3f0e1a1 100644
--- a/hostsidetests/cpptools/test-apps/DomainSocketApp/Android.bp
+++ b/hostsidetests/cpptools/test-apps/DomainSocketApp/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/deviceidle/Android.bp b/hostsidetests/deviceidle/Android.bp
index d7bb076..f49874b 100644
--- a/hostsidetests/deviceidle/Android.bp
+++ b/hostsidetests/deviceidle/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/Android.bp b/hostsidetests/devicepolicy/Android.bp
index 4eef832..c44e795 100644
--- a/hostsidetests/devicepolicy/Android.bp
+++ b/hostsidetests/devicepolicy/Android.bp
@@ -30,6 +30,7 @@
"cts",
"general-tests",
"vts",
+ "vts10",
],
java_resource_dirs: ["res"],
data: [":current-api-xml"],
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Android.bp b/hostsidetests/devicepolicy/app/AccountCheck/Android.bp
index e6edff6..97abf71 100644
--- a/hostsidetests/devicepolicy/app/AccountCheck/Android.bp
+++ b/hostsidetests/devicepolicy/app/AccountCheck/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src-owner/**/*.java"],
@@ -40,6 +41,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src-owner/**/*.java"],
@@ -61,6 +63,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src-owner/**/*.java"],
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.bp b/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.bp
index 9e9035c..0e71200 100644
--- a/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.bp
+++ b/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.bp b/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.bp
index 7ac443c..41f30dc 100644
--- a/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.bp
+++ b/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/devicepolicy/app/AccountManagement/Android.bp b/hostsidetests/devicepolicy/app/AccountManagement/Android.bp
index d5c59dd..6938ea4 100644
--- a/hostsidetests/devicepolicy/app/AccountManagement/Android.bp
+++ b/hostsidetests/devicepolicy/app/AccountManagement/Android.bp
@@ -20,6 +20,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/devicepolicy/app/AppRestrictionsTargetApp/Android.bp b/hostsidetests/devicepolicy/app/AppRestrictionsTargetApp/Android.bp
index b756842..e5b4e19 100644
--- a/hostsidetests/devicepolicy/app/AppRestrictionsTargetApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/AppRestrictionsTargetApp/Android.bp
@@ -23,6 +23,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/Assistant/Android.bp b/hostsidetests/devicepolicy/app/Assistant/Android.bp
index 91a7b79..0a58e3b 100644
--- a/hostsidetests/devicepolicy/app/Assistant/Android.bp
+++ b/hostsidetests/devicepolicy/app/Assistant/Android.bp
@@ -20,9 +20,11 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
"cts",
"vts",
+ "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/devicepolicy/app/AutofillApp/Android.bp b/hostsidetests/devicepolicy/app/AutofillApp/Android.bp
index acf343b..fb41d1b 100644
--- a/hostsidetests/devicepolicy/app/AutofillApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/AutofillApp/Android.bp
@@ -21,6 +21,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/devicepolicy/app/CertInstaller/Android.bp b/hostsidetests/devicepolicy/app/CertInstaller/Android.bp
index a3ae108..b0c65da 100644
--- a/hostsidetests/devicepolicy/app/CertInstaller/Android.bp
+++ b/hostsidetests/devicepolicy/app/CertInstaller/Android.bp
@@ -34,6 +34,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/ContactDirectoryProvider/Android.bp b/hostsidetests/devicepolicy/app/ContactDirectoryProvider/Android.bp
index 9387f0e..7064bd0 100644
--- a/hostsidetests/devicepolicy/app/ContactDirectoryProvider/Android.bp
+++ b/hostsidetests/devicepolicy/app/ContactDirectoryProvider/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/devicepolicy/app/ContentCaptureApp/Android.bp b/hostsidetests/devicepolicy/app/ContentCaptureApp/Android.bp
index 3f78f9d..9f76ebd 100644
--- a/hostsidetests/devicepolicy/app/ContentCaptureApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/ContentCaptureApp/Android.bp
@@ -21,6 +21,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "system_current",
diff --git a/hostsidetests/devicepolicy/app/ContentCaptureService/Android.bp b/hostsidetests/devicepolicy/app/ContentCaptureService/Android.bp
index 5c98da2..12d00e6 100644
--- a/hostsidetests/devicepolicy/app/ContentCaptureService/Android.bp
+++ b/hostsidetests/devicepolicy/app/ContentCaptureService/Android.bp
@@ -21,6 +21,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "system_current",
diff --git a/hostsidetests/devicepolicy/app/ContentSuggestionsApp/Android.bp b/hostsidetests/devicepolicy/app/ContentSuggestionsApp/Android.bp
index 2422d71..5d6b0d9 100644
--- a/hostsidetests/devicepolicy/app/ContentSuggestionsApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/ContentSuggestionsApp/Android.bp
@@ -21,6 +21,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "system_current",
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.bp b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.bp
index 5673db0..8dc75d5 100644
--- a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.bp
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.bp
@@ -42,6 +42,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -71,6 +72,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
aaptflags: [
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/Android.bp
index 94b6232..19c2bf2 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/Android.bp
@@ -30,6 +30,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/Android.bp
index 7ede135..4fa0c4e 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/Android.bp
@@ -30,6 +30,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledApp/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledApp/Android.bp
index 805897d..0c98f7f 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledApp/Android.bp
@@ -30,6 +30,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledNoPermsApp/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledNoPermsApp/Android.bp
index 44d5732..49e3dff 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledNoPermsApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileEnabledNoPermsApp/Android.bp
@@ -30,6 +30,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileNotEnabledApp/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileNotEnabledApp/Android.bp
index 7a6592d..2733337 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileNotEnabledApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileNotEnabledApp/Android.bp
@@ -30,6 +30,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileUserEnabledApp/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileUserEnabledApp/Android.bp
index f3c4611..7659eea 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileUserEnabledApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileUserEnabledApp/Android.bp
@@ -30,6 +30,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/CustomizationApp/Android.bp b/hostsidetests/devicepolicy/app/CustomizationApp/Android.bp
index b8eb974..a34e712 100644
--- a/hostsidetests/devicepolicy/app/CustomizationApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/CustomizationApp/Android.bp
@@ -19,6 +19,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/devicepolicy/app/DelegateApp/Android.bp b/hostsidetests/devicepolicy/app/DelegateApp/Android.bp
index 2a98af0..547e098 100644
--- a/hostsidetests/devicepolicy/app/DelegateApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/DelegateApp/Android.bp
@@ -34,6 +34,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/Android.bp b/hostsidetests/devicepolicy/app/DeviceAdmin/Android.bp
index 3a4e724..365029c 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdmin/Android.bp
+++ b/hostsidetests/devicepolicy/app/DeviceAdmin/Android.bp
@@ -31,6 +31,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "api23/AndroidManifest.xml",
@@ -57,6 +58,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "api24/AndroidManifest.xml",
@@ -81,6 +83,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "api29/AndroidManifest.xml",
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/Android.bp b/hostsidetests/devicepolicy/app/DeviceAdminService/Android.bp
index 4800c11..6bb0257 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdminService/Android.bp
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "package1/AndroidManifest.xml",
@@ -47,6 +48,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "package2/AndroidManifest.xml",
@@ -67,6 +69,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "package3/AndroidManifest.xml",
@@ -87,6 +90,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "package4/AndroidManifest.xml",
@@ -107,6 +111,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "packageb/AndroidManifest.xml",
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/Android.bp b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/Android.bp
index e6599b6..b8dd038 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/Android.bp
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/Android.bp
@@ -35,6 +35,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "api23/AndroidManifest.xml",
@@ -64,6 +65,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "api25/AndroidManifest.xml",
@@ -93,6 +95,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "latest/AndroidManifest.xml",
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/Android.bp b/hostsidetests/devicepolicy/app/DeviceOwner/Android.bp
index 70d59d6..47469b7 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/Android.bp
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/Android.bp
@@ -44,6 +44,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/DummyApps/Android.bp b/hostsidetests/devicepolicy/app/DummyApps/Android.bp
index 1b7c282..fd00ced 100644
--- a/hostsidetests/devicepolicy/app/DummyApps/Android.bp
+++ b/hostsidetests/devicepolicy/app/DummyApps/Android.bp
@@ -33,6 +33,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "dummyapp1/AndroidManifest.xml",
@@ -59,6 +60,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "dummyapp2/AndroidManifest.xml",
@@ -85,6 +87,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "dummyapp3/AndroidManifest.xml",
@@ -111,6 +114,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "dummyapp4/AndroidManifest.xml",
diff --git a/hostsidetests/devicepolicy/app/DummyIme/Android.bp b/hostsidetests/devicepolicy/app/DummyIme/Android.bp
index af8013e..a43b742 100644
--- a/hostsidetests/devicepolicy/app/DummyIme/Android.bp
+++ b/hostsidetests/devicepolicy/app/DummyIme/Android.bp
@@ -24,6 +24,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/DummyLauncher/Android.bp b/hostsidetests/devicepolicy/app/DummyLauncher/Android.bp
index dd0ab0a..0fcc74a 100644
--- a/hostsidetests/devicepolicy/app/DummyLauncher/Android.bp
+++ b/hostsidetests/devicepolicy/app/DummyLauncher/Android.bp
@@ -23,6 +23,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/HasLauncherActivityApp/Android.bp b/hostsidetests/devicepolicy/app/HasLauncherActivityApp/Android.bp
index 8dc698e..3f9ef51 100644
--- a/hostsidetests/devicepolicy/app/HasLauncherActivityApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/HasLauncherActivityApp/Android.bp
@@ -28,6 +28,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
@@ -48,6 +49,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "no_launcher_activity_AndroidManifest.xml",
@@ -69,6 +71,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
manifest: "no_permission_AndroidManifest.xml",
diff --git a/hostsidetests/devicepolicy/app/IntentReceiver/Android.bp b/hostsidetests/devicepolicy/app/IntentReceiver/Android.bp
index 8503e83..7e7ae83 100644
--- a/hostsidetests/devicepolicy/app/IntentReceiver/Android.bp
+++ b/hostsidetests/devicepolicy/app/IntentReceiver/Android.bp
@@ -31,6 +31,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/IntentSender/Android.bp b/hostsidetests/devicepolicy/app/IntentSender/Android.bp
index 0de3463..8b63e31 100644
--- a/hostsidetests/devicepolicy/app/IntentSender/Android.bp
+++ b/hostsidetests/devicepolicy/app/IntentSender/Android.bp
@@ -31,6 +31,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/LauncherTests/Android.bp b/hostsidetests/devicepolicy/app/LauncherTests/Android.bp
index 5b9dd20..7221a23 100644
--- a/hostsidetests/devicepolicy/app/LauncherTests/Android.bp
+++ b/hostsidetests/devicepolicy/app/LauncherTests/Android.bp
@@ -32,6 +32,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/LauncherTestsSupport/Android.bp b/hostsidetests/devicepolicy/app/LauncherTestsSupport/Android.bp
index c690f9c..b513ee9 100644
--- a/hostsidetests/devicepolicy/app/LauncherTestsSupport/Android.bp
+++ b/hostsidetests/devicepolicy/app/LauncherTestsSupport/Android.bp
@@ -24,6 +24,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp b/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp
index 4bd90fa..9a51bb0 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp
@@ -37,6 +37,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
platform_apis: true,
diff --git a/hostsidetests/devicepolicy/app/MeteredDataTestApp/Android.bp b/hostsidetests/devicepolicy/app/MeteredDataTestApp/Android.bp
index a308d22..ce1a4ad 100644
--- a/hostsidetests/devicepolicy/app/MeteredDataTestApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/MeteredDataTestApp/Android.bp
@@ -21,6 +21,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/devicepolicy/app/NotificationSender/Android.bp b/hostsidetests/devicepolicy/app/NotificationSender/Android.bp
index 56afe62..853f782 100644
--- a/hostsidetests/devicepolicy/app/NotificationSender/Android.bp
+++ b/hostsidetests/devicepolicy/app/NotificationSender/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/devicepolicy/app/PackageInstaller/Android.bp b/hostsidetests/devicepolicy/app/PackageInstaller/Android.bp
index 473666e..c36ae40 100644
--- a/hostsidetests/devicepolicy/app/PackageInstaller/Android.bp
+++ b/hostsidetests/devicepolicy/app/PackageInstaller/Android.bp
@@ -32,6 +32,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/PasswordComplexity/Android.bp b/hostsidetests/devicepolicy/app/PasswordComplexity/Android.bp
index 46daad8..b38e503 100644
--- a/hostsidetests/devicepolicy/app/PasswordComplexity/Android.bp
+++ b/hostsidetests/devicepolicy/app/PasswordComplexity/Android.bp
@@ -30,6 +30,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/PrintingApp/Android.bp b/hostsidetests/devicepolicy/app/PrintingApp/Android.bp
index 0cdad22..1667020 100644
--- a/hostsidetests/devicepolicy/app/PrintingApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/PrintingApp/Android.bp
@@ -22,6 +22,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/ProfileOwner/Android.bp b/hostsidetests/devicepolicy/app/ProfileOwner/Android.bp
index 2ead68f..10a036c 100644
--- a/hostsidetests/devicepolicy/app/ProfileOwner/Android.bp
+++ b/hostsidetests/devicepolicy/app/ProfileOwner/Android.bp
@@ -32,6 +32,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/SimpleApp/Android.bp b/hostsidetests/devicepolicy/app/SimpleApp/Android.bp
index 66d9ca1..c847244 100644
--- a/hostsidetests/devicepolicy/app/SimpleApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/SimpleApp/Android.bp
@@ -21,6 +21,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/devicepolicy/app/SimplePreMApp/Android.bp b/hostsidetests/devicepolicy/app/SimplePreMApp/Android.bp
index c52ad38..0fbc3d3 100644
--- a/hostsidetests/devicepolicy/app/SimplePreMApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/SimplePreMApp/Android.bp
@@ -24,6 +24,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/SingleAdminApp/Android.bp b/hostsidetests/devicepolicy/app/SingleAdminApp/Android.bp
index 28f59fa..0fafcbe 100644
--- a/hostsidetests/devicepolicy/app/SingleAdminApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/SingleAdminApp/Android.bp
@@ -32,6 +32,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/Android.bp b/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/Android.bp
index 614637d..34b0a68 100644
--- a/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/TransferOwnerIncomingApp/Android.bp
@@ -34,6 +34,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/Android.bp b/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/Android.bp
index f24944e..f6c6f08 100644
--- a/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/Android.bp
+++ b/hostsidetests/devicepolicy/app/TransferOwnerOutgoingApp/Android.bp
@@ -34,6 +34,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/WidgetProvider/Android.bp b/hostsidetests/devicepolicy/app/WidgetProvider/Android.bp
index 3b7aec3..16394e3 100644
--- a/hostsidetests/devicepolicy/app/WidgetProvider/Android.bp
+++ b/hostsidetests/devicepolicy/app/WidgetProvider/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/devicepolicy/app/WifiConfigCreator/Android.bp b/hostsidetests/devicepolicy/app/WifiConfigCreator/Android.bp
index 0d7f72f..66668e4 100644
--- a/hostsidetests/devicepolicy/app/WifiConfigCreator/Android.bp
+++ b/hostsidetests/devicepolicy/app/WifiConfigCreator/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/dumpsys/Android.bp b/hostsidetests/dumpsys/Android.bp
index d26c8c4..4434430 100644
--- a/hostsidetests/dumpsys/Android.bp
+++ b/hostsidetests/dumpsys/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.bp b/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.bp
index 1dcf148..ee120c4 100644
--- a/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.bp
+++ b/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.bp b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.bp
index 8bd1e8e..a7b8e42 100644
--- a/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.bp
+++ b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.bp
@@ -28,6 +28,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.bp b/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.bp
index abaf6cd..4773ff9 100644
--- a/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.bp
+++ b/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.bp
@@ -30,6 +30,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/dumpsys/apps/storagedapp/Android.bp b/hostsidetests/dumpsys/apps/storagedapp/Android.bp
index 321d5f9..9bb7e3b 100644
--- a/hostsidetests/dumpsys/apps/storagedapp/Android.bp
+++ b/hostsidetests/dumpsys/apps/storagedapp/Android.bp
@@ -30,6 +30,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/edi/Android.bp b/hostsidetests/edi/Android.bp
index 2a8ac6e..912c165 100644
--- a/hostsidetests/edi/Android.bp
+++ b/hostsidetests/edi/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/harmfulappwarning/Android.bp b/hostsidetests/harmfulappwarning/Android.bp
index eef6b59..ff9dec7 100644
--- a/hostsidetests/harmfulappwarning/Android.bp
+++ b/hostsidetests/harmfulappwarning/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/harmfulappwarning/sampleapp/Android.bp b/hostsidetests/harmfulappwarning/sampleapp/Android.bp
index e129af5..cb68d80 100644
--- a/hostsidetests/harmfulappwarning/sampleapp/Android.bp
+++ b/hostsidetests/harmfulappwarning/sampleapp/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/harmfulappwarning/testapp/Android.bp b/hostsidetests/harmfulappwarning/testapp/Android.bp
index 9e1174f..a9785f3 100644
--- a/hostsidetests/harmfulappwarning/testapp/Android.bp
+++ b/hostsidetests/harmfulappwarning/testapp/Android.bp
@@ -30,6 +30,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/hdmicec/Android.bp b/hostsidetests/hdmicec/Android.bp
index 0fa3a6a..3ab68f6 100644
--- a/hostsidetests/hdmicec/Android.bp
+++ b/hostsidetests/hdmicec/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/incident/Android.bp b/hostsidetests/incident/Android.bp
index 3a3801b..7066e24 100644
--- a/hostsidetests/incident/Android.bp
+++ b/hostsidetests/incident/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/incident/apps/batterystatsapp/Android.bp b/hostsidetests/incident/apps/batterystatsapp/Android.bp
index 3cbe960..8ed1fcb 100644
--- a/hostsidetests/incident/apps/batterystatsapp/Android.bp
+++ b/hostsidetests/incident/apps/batterystatsapp/Android.bp
@@ -31,6 +31,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/incident/apps/boundwidgetapp/Android.bp b/hostsidetests/incident/apps/boundwidgetapp/Android.bp
index 4e710d8..a91c48d 100644
--- a/hostsidetests/incident/apps/boundwidgetapp/Android.bp
+++ b/hostsidetests/incident/apps/boundwidgetapp/Android.bp
@@ -31,6 +31,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/incident/apps/errorsapp/Android.bp b/hostsidetests/incident/apps/errorsapp/Android.bp
index 738feb5..fcbee4a 100644
--- a/hostsidetests/incident/apps/errorsapp/Android.bp
+++ b/hostsidetests/incident/apps/errorsapp/Android.bp
@@ -33,6 +33,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/incident/apps/graphicsstatsapp/Android.bp b/hostsidetests/incident/apps/graphicsstatsapp/Android.bp
index c64f8a8..2711453 100644
--- a/hostsidetests/incident/apps/graphicsstatsapp/Android.bp
+++ b/hostsidetests/incident/apps/graphicsstatsapp/Android.bp
@@ -31,6 +31,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/incident/apps/netstatsapp/Android.bp b/hostsidetests/incident/apps/netstatsapp/Android.bp
index 551d27e..fe44669 100644
--- a/hostsidetests/incident/apps/netstatsapp/Android.bp
+++ b/hostsidetests/incident/apps/netstatsapp/Android.bp
@@ -30,6 +30,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/incident/apps/notificationsapp/Android.bp b/hostsidetests/incident/apps/notificationsapp/Android.bp
index 6bd3991..dd51c40 100644
--- a/hostsidetests/incident/apps/notificationsapp/Android.bp
+++ b/hostsidetests/incident/apps/notificationsapp/Android.bp
@@ -31,6 +31,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/incident/apps/procstatsapp/Android.bp b/hostsidetests/incident/apps/procstatsapp/Android.bp
index 0626e23..b374ce2 100644
--- a/hostsidetests/incident/apps/procstatsapp/Android.bp
+++ b/hostsidetests/incident/apps/procstatsapp/Android.bp
@@ -30,6 +30,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/inputmethodservice/common/Android.bp b/hostsidetests/inputmethodservice/common/Android.bp
index 6480839..e1d23ed 100644
--- a/hostsidetests/inputmethodservice/common/Android.bp
+++ b/hostsidetests/inputmethodservice/common/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/Android.bp b/hostsidetests/inputmethodservice/deviceside/devicetest/Android.bp
index 30bf5cb..8f5a256 100644
--- a/hostsidetests/inputmethodservice/deviceside/devicetest/Android.bp
+++ b/hostsidetests/inputmethodservice/deviceside/devicetest/Android.bp
@@ -29,6 +29,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/inputmethodservice/deviceside/edittextapp/Android.bp b/hostsidetests/inputmethodservice/deviceside/edittextapp/Android.bp
index e2f7105..e91a215 100644
--- a/hostsidetests/inputmethodservice/deviceside/edittextapp/Android.bp
+++ b/hostsidetests/inputmethodservice/deviceside/edittextapp/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/inputmethodservice/deviceside/ime1/Android.bp b/hostsidetests/inputmethodservice/deviceside/ime1/Android.bp
index 43ce201..017baa1 100644
--- a/hostsidetests/inputmethodservice/deviceside/ime1/Android.bp
+++ b/hostsidetests/inputmethodservice/deviceside/ime1/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/inputmethodservice/deviceside/ime2/Android.bp b/hostsidetests/inputmethodservice/deviceside/ime2/Android.bp
index 61480a2..f9c4314 100644
--- a/hostsidetests/inputmethodservice/deviceside/ime2/Android.bp
+++ b/hostsidetests/inputmethodservice/deviceside/ime2/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/inputmethodservice/deviceside/lib/Android.bp b/hostsidetests/inputmethodservice/deviceside/lib/Android.bp
index cecc584..1bd38c1 100644
--- a/hostsidetests/inputmethodservice/deviceside/lib/Android.bp
+++ b/hostsidetests/inputmethodservice/deviceside/lib/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/inputmethodservice/deviceside/provider/Android.bp b/hostsidetests/inputmethodservice/deviceside/provider/Android.bp
index 3d5a727..1f406a3 100644
--- a/hostsidetests/inputmethodservice/deviceside/provider/Android.bp
+++ b/hostsidetests/inputmethodservice/deviceside/provider/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/inputmethodservice/hostside/Android.bp b/hostsidetests/inputmethodservice/hostside/Android.bp
index 35bec6d..a809698 100644
--- a/hostsidetests/inputmethodservice/hostside/Android.bp
+++ b/hostsidetests/inputmethodservice/hostside/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/jdwpsecurity/Android.bp b/hostsidetests/jdwpsecurity/Android.bp
index 8e99529..495e585 100644
--- a/hostsidetests/jdwpsecurity/Android.bp
+++ b/hostsidetests/jdwpsecurity/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJdwpApp"],
diff --git a/hostsidetests/jdwptunnel/Android.bp b/hostsidetests/jdwptunnel/Android.bp
index fbc18fa..37cb6ce 100644
--- a/hostsidetests/jdwptunnel/Android.bp
+++ b/hostsidetests/jdwptunnel/Android.bp
@@ -34,6 +34,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
diff --git a/hostsidetests/jvmti/allocation-tracking/Android.bp b/hostsidetests/jvmti/allocation-tracking/Android.bp
index 8c87af5..2d32d4f 100644
--- a/hostsidetests/jvmti/allocation-tracking/Android.bp
+++ b/hostsidetests/jvmti/allocation-tracking/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/jvmti/allocation-tracking/app/Android.bp b/hostsidetests/jvmti/allocation-tracking/app/Android.bp
index d2d5feb..95e7df6 100644
--- a/hostsidetests/jvmti/allocation-tracking/app/Android.bp
+++ b/hostsidetests/jvmti/allocation-tracking/app/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
static_libs: ["CtsJvmtiDeviceAppBase"],
diff --git a/hostsidetests/jvmti/attaching/Android.bp b/hostsidetests/jvmti/attaching/Android.bp
index 48b095e..03f921d 100644
--- a/hostsidetests/jvmti/attaching/Android.bp
+++ b/hostsidetests/jvmti/attaching/Android.bp
@@ -82,6 +82,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
test_config: "host/AndroidTest.xml",
diff --git a/hostsidetests/jvmti/redefining/Android.bp b/hostsidetests/jvmti/redefining/Android.bp
index 6de0131..7f5bae1 100644
--- a/hostsidetests/jvmti/redefining/Android.bp
+++ b/hostsidetests/jvmti/redefining/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRedefineClassesDeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1900/Android.bp b/hostsidetests/jvmti/run-tests/test-1900/Android.bp
index 13f8765..7535d66 100644
--- a/hostsidetests/jvmti/run-tests/test-1900/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1900/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1900DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1901/Android.bp b/hostsidetests/jvmti/run-tests/test-1901/Android.bp
index 2c7c6a6..d1d29c6 100644
--- a/hostsidetests/jvmti/run-tests/test-1901/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1901/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1901DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1902/Android.bp b/hostsidetests/jvmti/run-tests/test-1902/Android.bp
index 3683e58..812d0e6 100644
--- a/hostsidetests/jvmti/run-tests/test-1902/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1902/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1902DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1903/Android.bp b/hostsidetests/jvmti/run-tests/test-1903/Android.bp
index cb8470f..64a2002 100644
--- a/hostsidetests/jvmti/run-tests/test-1903/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1903/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1903DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1904/Android.bp b/hostsidetests/jvmti/run-tests/test-1904/Android.bp
index 0eb9b1d..f2750a0 100644
--- a/hostsidetests/jvmti/run-tests/test-1904/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1904/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1904DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1906/Android.bp b/hostsidetests/jvmti/run-tests/test-1906/Android.bp
index 9aadc1a..89f5feb 100644
--- a/hostsidetests/jvmti/run-tests/test-1906/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1906/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1906DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1907/Android.bp b/hostsidetests/jvmti/run-tests/test-1907/Android.bp
index 0f88968..935cf99 100644
--- a/hostsidetests/jvmti/run-tests/test-1907/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1907/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1907DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1908/Android.bp b/hostsidetests/jvmti/run-tests/test-1908/Android.bp
index 308ebc6..8dfde43 100644
--- a/hostsidetests/jvmti/run-tests/test-1908/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1908/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1908DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1909/Android.bp b/hostsidetests/jvmti/run-tests/test-1909/Android.bp
index c8f7822..a8ba25b 100644
--- a/hostsidetests/jvmti/run-tests/test-1909/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1909/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1909DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1910/Android.bp b/hostsidetests/jvmti/run-tests/test-1910/Android.bp
index 1918925..93b7086 100644
--- a/hostsidetests/jvmti/run-tests/test-1910/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1910/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1910DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1911/Android.bp b/hostsidetests/jvmti/run-tests/test-1911/Android.bp
index 74f484f..c79050b 100644
--- a/hostsidetests/jvmti/run-tests/test-1911/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1911/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1911DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1912/Android.bp b/hostsidetests/jvmti/run-tests/test-1912/Android.bp
index e39ae46..6195d5b 100644
--- a/hostsidetests/jvmti/run-tests/test-1912/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1912/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1912DeviceApp"]
diff --git a/hostsidetests/jvmti/run-tests/test-1913/Android.bp b/hostsidetests/jvmti/run-tests/test-1913/Android.bp
index 741c60d..5e74dfd 100644
--- a/hostsidetests/jvmti/run-tests/test-1913/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1913/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1913DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1914/Android.bp b/hostsidetests/jvmti/run-tests/test-1914/Android.bp
index a585538..7e67d4c 100644
--- a/hostsidetests/jvmti/run-tests/test-1914/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1914/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1914DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1915/Android.bp b/hostsidetests/jvmti/run-tests/test-1915/Android.bp
index aaf75cb..81b6445 100644
--- a/hostsidetests/jvmti/run-tests/test-1915/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1915/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1915DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1916/Android.bp b/hostsidetests/jvmti/run-tests/test-1916/Android.bp
index c737491..e8f00db 100644
--- a/hostsidetests/jvmti/run-tests/test-1916/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1916/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1916DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1917/Android.bp b/hostsidetests/jvmti/run-tests/test-1917/Android.bp
index b9eb679..48e0127 100644
--- a/hostsidetests/jvmti/run-tests/test-1917/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1917/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1917DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1920/Android.bp b/hostsidetests/jvmti/run-tests/test-1920/Android.bp
index ce42c57..29b111c 100644
--- a/hostsidetests/jvmti/run-tests/test-1920/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1920/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1920DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1921/Android.bp b/hostsidetests/jvmti/run-tests/test-1921/Android.bp
index 553f8a1..2b213d0 100644
--- a/hostsidetests/jvmti/run-tests/test-1921/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1921/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1921DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1922/Android.bp b/hostsidetests/jvmti/run-tests/test-1922/Android.bp
index a38c5a9..0bf671b 100644
--- a/hostsidetests/jvmti/run-tests/test-1922/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1922/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1922DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1923/Android.bp b/hostsidetests/jvmti/run-tests/test-1923/Android.bp
index 7d49861..c7d7b5a 100644
--- a/hostsidetests/jvmti/run-tests/test-1923/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1923/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1923DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1924/Android.bp b/hostsidetests/jvmti/run-tests/test-1924/Android.bp
index 0f7dec9..4e1d9a5 100644
--- a/hostsidetests/jvmti/run-tests/test-1924/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1924/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1924DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1925/Android.bp b/hostsidetests/jvmti/run-tests/test-1925/Android.bp
index 4076977..be46c41 100644
--- a/hostsidetests/jvmti/run-tests/test-1925/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1925/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1925DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1926/Android.bp b/hostsidetests/jvmti/run-tests/test-1926/Android.bp
index 50c1f42..d352105 100644
--- a/hostsidetests/jvmti/run-tests/test-1926/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1926/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1926DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1927/Android.bp b/hostsidetests/jvmti/run-tests/test-1927/Android.bp
index fb55fb4..f618f61 100644
--- a/hostsidetests/jvmti/run-tests/test-1927/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1927/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1927DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1928/Android.bp b/hostsidetests/jvmti/run-tests/test-1928/Android.bp
index 9f82560..793e885 100644
--- a/hostsidetests/jvmti/run-tests/test-1928/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1928/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1928DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1930/Android.bp b/hostsidetests/jvmti/run-tests/test-1930/Android.bp
index c7931c8..5369d38 100644
--- a/hostsidetests/jvmti/run-tests/test-1930/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1930/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1930DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1931/Android.bp b/hostsidetests/jvmti/run-tests/test-1931/Android.bp
index 1ad7236..681535b 100644
--- a/hostsidetests/jvmti/run-tests/test-1931/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1931/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1931DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1932/Android.bp b/hostsidetests/jvmti/run-tests/test-1932/Android.bp
index acbebed..03c71d0 100644
--- a/hostsidetests/jvmti/run-tests/test-1932/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1932/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1932DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1933/Android.bp b/hostsidetests/jvmti/run-tests/test-1933/Android.bp
index 4fde3e5..b6bf998 100644
--- a/hostsidetests/jvmti/run-tests/test-1933/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1933/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1933DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1934/Android.bp b/hostsidetests/jvmti/run-tests/test-1934/Android.bp
index a7b003c..f1ae3c5 100644
--- a/hostsidetests/jvmti/run-tests/test-1934/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1934/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1934DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1936/Android.bp b/hostsidetests/jvmti/run-tests/test-1936/Android.bp
index 7c4b29d..df7abc7 100644
--- a/hostsidetests/jvmti/run-tests/test-1936/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1936/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1936DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1937/Android.bp b/hostsidetests/jvmti/run-tests/test-1937/Android.bp
index 6814ef4..a541a8b 100644
--- a/hostsidetests/jvmti/run-tests/test-1937/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1937/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1937DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1939/Android.bp b/hostsidetests/jvmti/run-tests/test-1939/Android.bp
index 43685b9..7cfcb1b 100644
--- a/hostsidetests/jvmti/run-tests/test-1939/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1939/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1939DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1941/Android.bp b/hostsidetests/jvmti/run-tests/test-1941/Android.bp
index 94eeb35..b9649cf 100644
--- a/hostsidetests/jvmti/run-tests/test-1941/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1941/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1941DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1942/Android.bp b/hostsidetests/jvmti/run-tests/test-1942/Android.bp
index b7dd9aa..f194c2d 100644
--- a/hostsidetests/jvmti/run-tests/test-1942/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1942/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1942DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1943/Android.bp b/hostsidetests/jvmti/run-tests/test-1943/Android.bp
index 9266e79..8021c66 100644
--- a/hostsidetests/jvmti/run-tests/test-1943/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1943/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1943DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1953/Android.bp b/hostsidetests/jvmti/run-tests/test-1953/Android.bp
index b428f90..5bee56c 100644
--- a/hostsidetests/jvmti/run-tests/test-1953/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1953/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1953DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1958/Android.bp b/hostsidetests/jvmti/run-tests/test-1958/Android.bp
index 661582e..fc0c4b9 100644
--- a/hostsidetests/jvmti/run-tests/test-1958/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1958/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1958DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1962/Android.bp b/hostsidetests/jvmti/run-tests/test-1962/Android.bp
index 97f9dc5..e285887 100644
--- a/hostsidetests/jvmti/run-tests/test-1962/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1962/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1962DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1967/Android.bp b/hostsidetests/jvmti/run-tests/test-1967/Android.bp
index 71cace5..0be835c 100644
--- a/hostsidetests/jvmti/run-tests/test-1967/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1967/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1967DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1968/Android.bp b/hostsidetests/jvmti/run-tests/test-1968/Android.bp
index a5166fd..58ff9d5 100644
--- a/hostsidetests/jvmti/run-tests/test-1968/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1968/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1968DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1969/Android.bp b/hostsidetests/jvmti/run-tests/test-1969/Android.bp
index d04b251..c3581e8 100644
--- a/hostsidetests/jvmti/run-tests/test-1969/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1969/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1969DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1970/Android.bp b/hostsidetests/jvmti/run-tests/test-1970/Android.bp
index c0839ff..042de07 100644
--- a/hostsidetests/jvmti/run-tests/test-1970/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1970/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1970DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1971/Android.bp b/hostsidetests/jvmti/run-tests/test-1971/Android.bp
index 13d2ced..05e1277 100644
--- a/hostsidetests/jvmti/run-tests/test-1971/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1971/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1971DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1974/Android.bp b/hostsidetests/jvmti/run-tests/test-1974/Android.bp
index d15a1e9..8813ff1 100644
--- a/hostsidetests/jvmti/run-tests/test-1974/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1974/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1974DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1975/Android.bp b/hostsidetests/jvmti/run-tests/test-1975/Android.bp
index 335aa16..48bc7c5 100644
--- a/hostsidetests/jvmti/run-tests/test-1975/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1975/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1975DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1976/Android.bp b/hostsidetests/jvmti/run-tests/test-1976/Android.bp
index 0c1fdda..eb3bfba 100644
--- a/hostsidetests/jvmti/run-tests/test-1976/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1976/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1976DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1977/Android.bp b/hostsidetests/jvmti/run-tests/test-1977/Android.bp
index 99f10e2..93b98fc 100644
--- a/hostsidetests/jvmti/run-tests/test-1977/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1977/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1977DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1978/Android.bp b/hostsidetests/jvmti/run-tests/test-1978/Android.bp
index 581b406..89d7183 100644
--- a/hostsidetests/jvmti/run-tests/test-1978/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1978/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1978DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1979/Android.bp b/hostsidetests/jvmti/run-tests/test-1979/Android.bp
index 26d590f..ca9e217 100644
--- a/hostsidetests/jvmti/run-tests/test-1979/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1979/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1979DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1981/Android.bp b/hostsidetests/jvmti/run-tests/test-1981/Android.bp
index ab0d946..979c1c8 100644
--- a/hostsidetests/jvmti/run-tests/test-1981/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1981/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1981DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1982/Android.bp b/hostsidetests/jvmti/run-tests/test-1982/Android.bp
index 6656637..c126070 100644
--- a/hostsidetests/jvmti/run-tests/test-1982/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1982/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1982DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1983/Android.bp b/hostsidetests/jvmti/run-tests/test-1983/Android.bp
index 994b62f..4720cf5 100644
--- a/hostsidetests/jvmti/run-tests/test-1983/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1983/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1983DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1984/Android.bp b/hostsidetests/jvmti/run-tests/test-1984/Android.bp
index f23c878..8fc7a9b 100644
--- a/hostsidetests/jvmti/run-tests/test-1984/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1984/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1984DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1988/Android.bp b/hostsidetests/jvmti/run-tests/test-1988/Android.bp
index 8042eaa..a6c30b6 100644
--- a/hostsidetests/jvmti/run-tests/test-1988/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1988/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1988DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1989/Android.bp b/hostsidetests/jvmti/run-tests/test-1989/Android.bp
index ea9c10a..c84028d 100644
--- a/hostsidetests/jvmti/run-tests/test-1989/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1989/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1989DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1990/Android.bp b/hostsidetests/jvmti/run-tests/test-1990/Android.bp
index 7a8b0f2..2b05765 100644
--- a/hostsidetests/jvmti/run-tests/test-1990/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1990/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1990DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1991/Android.bp b/hostsidetests/jvmti/run-tests/test-1991/Android.bp
index 0accac1..6060c29 100644
--- a/hostsidetests/jvmti/run-tests/test-1991/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1991/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1991DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1992/Android.bp b/hostsidetests/jvmti/run-tests/test-1992/Android.bp
index 61f112c..e08ad9b 100644
--- a/hostsidetests/jvmti/run-tests/test-1992/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1992/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1992DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1994/Android.bp b/hostsidetests/jvmti/run-tests/test-1994/Android.bp
index 79de6f0..1d5d6a0 100644
--- a/hostsidetests/jvmti/run-tests/test-1994/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1994/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1994DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1995/Android.bp b/hostsidetests/jvmti/run-tests/test-1995/Android.bp
index fe2b24b..d5993f2 100644
--- a/hostsidetests/jvmti/run-tests/test-1995/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1995/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1995DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1996/Android.bp b/hostsidetests/jvmti/run-tests/test-1996/Android.bp
index 1470ef4..7cda84f 100644
--- a/hostsidetests/jvmti/run-tests/test-1996/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1996/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1996DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1997/Android.bp b/hostsidetests/jvmti/run-tests/test-1997/Android.bp
index 3493cd0..3e796eb 100644
--- a/hostsidetests/jvmti/run-tests/test-1997/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1997/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1997DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1998/Android.bp b/hostsidetests/jvmti/run-tests/test-1998/Android.bp
index 63ce180..4adff56 100644
--- a/hostsidetests/jvmti/run-tests/test-1998/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1998/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1998DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-1999/Android.bp b/hostsidetests/jvmti/run-tests/test-1999/Android.bp
index 8e28df9..fc4e148 100644
--- a/hostsidetests/jvmti/run-tests/test-1999/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-1999/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest1999DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-2001/Android.bp b/hostsidetests/jvmti/run-tests/test-2001/Android.bp
index 7f7775d..eebf03a 100644
--- a/hostsidetests/jvmti/run-tests/test-2001/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-2001/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest2001DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-2002/Android.bp b/hostsidetests/jvmti/run-tests/test-2002/Android.bp
index 2c0dd1e..4f71db3 100644
--- a/hostsidetests/jvmti/run-tests/test-2002/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-2002/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest2002DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-2003/Android.bp b/hostsidetests/jvmti/run-tests/test-2003/Android.bp
index d206018..7dfd01b 100644
--- a/hostsidetests/jvmti/run-tests/test-2003/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-2003/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest2003DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-2004/Android.bp b/hostsidetests/jvmti/run-tests/test-2004/Android.bp
index d7a9848..12c9aea 100644
--- a/hostsidetests/jvmti/run-tests/test-2004/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-2004/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest2004DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-2005/Android.bp b/hostsidetests/jvmti/run-tests/test-2005/Android.bp
index df0bf81..d3f2680 100644
--- a/hostsidetests/jvmti/run-tests/test-2005/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-2005/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest2005DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-2006/Android.bp b/hostsidetests/jvmti/run-tests/test-2006/Android.bp
index 9f2807b..2d91db3 100644
--- a/hostsidetests/jvmti/run-tests/test-2006/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-2006/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest2006DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-2007/Android.bp b/hostsidetests/jvmti/run-tests/test-2007/Android.bp
index f6cd80c..dd70b58 100644
--- a/hostsidetests/jvmti/run-tests/test-2007/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-2007/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest2007DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-902/Android.bp b/hostsidetests/jvmti/run-tests/test-902/Android.bp
index 380b464..d56abe5 100644
--- a/hostsidetests/jvmti/run-tests/test-902/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-902/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest902DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-903/Android.bp b/hostsidetests/jvmti/run-tests/test-903/Android.bp
index 966fc5f..fad5c04 100644
--- a/hostsidetests/jvmti/run-tests/test-903/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-903/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest903DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-904/Android.bp b/hostsidetests/jvmti/run-tests/test-904/Android.bp
index 82966af..106cf9b 100644
--- a/hostsidetests/jvmti/run-tests/test-904/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-904/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest904DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-905/Android.bp b/hostsidetests/jvmti/run-tests/test-905/Android.bp
index cbf9100..ac107f2 100644
--- a/hostsidetests/jvmti/run-tests/test-905/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-905/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest905DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-906/Android.bp b/hostsidetests/jvmti/run-tests/test-906/Android.bp
index c172214..6962053 100644
--- a/hostsidetests/jvmti/run-tests/test-906/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-906/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest906DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-907/Android.bp b/hostsidetests/jvmti/run-tests/test-907/Android.bp
index 39e9d20..e9060e2 100644
--- a/hostsidetests/jvmti/run-tests/test-907/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-907/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest907DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-908/Android.bp b/hostsidetests/jvmti/run-tests/test-908/Android.bp
index ec637cb..2ff9a92 100644
--- a/hostsidetests/jvmti/run-tests/test-908/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-908/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest908DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-910/Android.bp b/hostsidetests/jvmti/run-tests/test-910/Android.bp
index 6005632..2fd4b48 100644
--- a/hostsidetests/jvmti/run-tests/test-910/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-910/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest910DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-911/Android.bp b/hostsidetests/jvmti/run-tests/test-911/Android.bp
index 762739e..11413f4 100644
--- a/hostsidetests/jvmti/run-tests/test-911/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-911/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest911DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-912/Android.bp b/hostsidetests/jvmti/run-tests/test-912/Android.bp
index 2c7e7a2..9eeb9ba 100644
--- a/hostsidetests/jvmti/run-tests/test-912/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-912/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest912DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-913/Android.bp b/hostsidetests/jvmti/run-tests/test-913/Android.bp
index c0a3a7c..d0cf87fb 100644
--- a/hostsidetests/jvmti/run-tests/test-913/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-913/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest913DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-914/Android.bp b/hostsidetests/jvmti/run-tests/test-914/Android.bp
index 6024041..7a895ea 100644
--- a/hostsidetests/jvmti/run-tests/test-914/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-914/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest914DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-915/Android.bp b/hostsidetests/jvmti/run-tests/test-915/Android.bp
index c67eeb4..df379c3 100644
--- a/hostsidetests/jvmti/run-tests/test-915/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-915/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest915DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-917/Android.bp b/hostsidetests/jvmti/run-tests/test-917/Android.bp
index 05cc057..fc46ab1 100644
--- a/hostsidetests/jvmti/run-tests/test-917/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-917/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest917DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-918/Android.bp b/hostsidetests/jvmti/run-tests/test-918/Android.bp
index 925c560..c445508 100644
--- a/hostsidetests/jvmti/run-tests/test-918/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-918/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest918DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-919/Android.bp b/hostsidetests/jvmti/run-tests/test-919/Android.bp
index 059344b..488488a 100644
--- a/hostsidetests/jvmti/run-tests/test-919/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-919/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest919DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-920/Android.bp b/hostsidetests/jvmti/run-tests/test-920/Android.bp
index 5c60573..af4bcec 100644
--- a/hostsidetests/jvmti/run-tests/test-920/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-920/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest920DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-922/Android.bp b/hostsidetests/jvmti/run-tests/test-922/Android.bp
index 6e2f8b5..8c3be3d 100644
--- a/hostsidetests/jvmti/run-tests/test-922/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-922/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest922DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-923/Android.bp b/hostsidetests/jvmti/run-tests/test-923/Android.bp
index 93f69da..afbd62d 100644
--- a/hostsidetests/jvmti/run-tests/test-923/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-923/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest923DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-924/Android.bp b/hostsidetests/jvmti/run-tests/test-924/Android.bp
index ac01e56..51d76e9 100644
--- a/hostsidetests/jvmti/run-tests/test-924/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-924/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest924DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-926/Android.bp b/hostsidetests/jvmti/run-tests/test-926/Android.bp
index 4b17ff2..8d38a98 100644
--- a/hostsidetests/jvmti/run-tests/test-926/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-926/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest926DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-927/Android.bp b/hostsidetests/jvmti/run-tests/test-927/Android.bp
index 8703cce..b1e4a57 100644
--- a/hostsidetests/jvmti/run-tests/test-927/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-927/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest927DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-928/Android.bp b/hostsidetests/jvmti/run-tests/test-928/Android.bp
index ac39f3d..27c412d 100644
--- a/hostsidetests/jvmti/run-tests/test-928/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-928/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest928DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-930/Android.bp b/hostsidetests/jvmti/run-tests/test-930/Android.bp
index c428847..2cc5d79 100644
--- a/hostsidetests/jvmti/run-tests/test-930/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-930/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest930DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-931/Android.bp b/hostsidetests/jvmti/run-tests/test-931/Android.bp
index bf11253..dc71784 100644
--- a/hostsidetests/jvmti/run-tests/test-931/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-931/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest931DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-932/Android.bp b/hostsidetests/jvmti/run-tests/test-932/Android.bp
index 424551e..6cbcde6 100644
--- a/hostsidetests/jvmti/run-tests/test-932/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-932/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest932DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-940/Android.bp b/hostsidetests/jvmti/run-tests/test-940/Android.bp
index 385371a..411f7a4 100644
--- a/hostsidetests/jvmti/run-tests/test-940/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-940/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest940DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-942/Android.bp b/hostsidetests/jvmti/run-tests/test-942/Android.bp
index bed04be..781359d 100644
--- a/hostsidetests/jvmti/run-tests/test-942/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-942/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest942DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-944/Android.bp b/hostsidetests/jvmti/run-tests/test-944/Android.bp
index ef75ef1..32aa760 100644
--- a/hostsidetests/jvmti/run-tests/test-944/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-944/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest944DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-945/Android.bp b/hostsidetests/jvmti/run-tests/test-945/Android.bp
index e5ae43f..15116f6 100644
--- a/hostsidetests/jvmti/run-tests/test-945/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-945/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest945DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-947/Android.bp b/hostsidetests/jvmti/run-tests/test-947/Android.bp
index 10b3914..aa04c92 100644
--- a/hostsidetests/jvmti/run-tests/test-947/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-947/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest947DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-951/Android.bp b/hostsidetests/jvmti/run-tests/test-951/Android.bp
index c903e9b..b792132 100644
--- a/hostsidetests/jvmti/run-tests/test-951/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-951/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest951DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-982/Android.bp b/hostsidetests/jvmti/run-tests/test-982/Android.bp
index 2410aa7..ae7370e 100644
--- a/hostsidetests/jvmti/run-tests/test-982/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-982/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest982DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-983/Android.bp b/hostsidetests/jvmti/run-tests/test-983/Android.bp
index 6739b4c..524c38c 100644
--- a/hostsidetests/jvmti/run-tests/test-983/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-983/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest983DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-984/Android.bp b/hostsidetests/jvmti/run-tests/test-984/Android.bp
index 3662e48..272bd95 100644
--- a/hostsidetests/jvmti/run-tests/test-984/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-984/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest984DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-985/Android.bp b/hostsidetests/jvmti/run-tests/test-985/Android.bp
index 934f932..0604119 100644
--- a/hostsidetests/jvmti/run-tests/test-985/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-985/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest985DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-986/Android.bp b/hostsidetests/jvmti/run-tests/test-986/Android.bp
index 278a581..6d06cd8 100644
--- a/hostsidetests/jvmti/run-tests/test-986/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-986/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest986DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-988/Android.bp b/hostsidetests/jvmti/run-tests/test-988/Android.bp
index b5d1d63..249ac75 100644
--- a/hostsidetests/jvmti/run-tests/test-988/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-988/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest988DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-989/Android.bp b/hostsidetests/jvmti/run-tests/test-989/Android.bp
index ea56478..b66c571 100644
--- a/hostsidetests/jvmti/run-tests/test-989/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-989/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest989DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-990/Android.bp b/hostsidetests/jvmti/run-tests/test-990/Android.bp
index 03553cd..bab8e83 100644
--- a/hostsidetests/jvmti/run-tests/test-990/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-990/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest990DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-991/Android.bp b/hostsidetests/jvmti/run-tests/test-991/Android.bp
index 1ce2875..b246007 100644
--- a/hostsidetests/jvmti/run-tests/test-991/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-991/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest991DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-992/Android.bp b/hostsidetests/jvmti/run-tests/test-992/Android.bp
index 9abfe40..55943ff 100644
--- a/hostsidetests/jvmti/run-tests/test-992/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-992/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest992DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-993/Android.bp b/hostsidetests/jvmti/run-tests/test-993/Android.bp
index 47d25d4..3136944 100644
--- a/hostsidetests/jvmti/run-tests/test-993/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-993/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest993DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-994/Android.bp b/hostsidetests/jvmti/run-tests/test-994/Android.bp
index 97df559..be9dcf7 100644
--- a/hostsidetests/jvmti/run-tests/test-994/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-994/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest994DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-995/Android.bp b/hostsidetests/jvmti/run-tests/test-995/Android.bp
index 50d4f24..0d5c0a7 100644
--- a/hostsidetests/jvmti/run-tests/test-995/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-995/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest995DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-996/Android.bp b/hostsidetests/jvmti/run-tests/test-996/Android.bp
index 9dfdeef..88b28df 100644
--- a/hostsidetests/jvmti/run-tests/test-996/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-996/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest996DeviceApp"],
diff --git a/hostsidetests/jvmti/run-tests/test-997/Android.bp b/hostsidetests/jvmti/run-tests/test-997/Android.bp
index 8b1733d..bc35aa7 100644
--- a/hostsidetests/jvmti/run-tests/test-997/Android.bp
+++ b/hostsidetests/jvmti/run-tests/test-997/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiRunTest997DeviceApp"],
diff --git a/hostsidetests/jvmti/tagging/Android.bp b/hostsidetests/jvmti/tagging/Android.bp
index 29b16d3..e1a5925 100644
--- a/hostsidetests/jvmti/tagging/Android.bp
+++ b/hostsidetests/jvmti/tagging/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
data: [":CtsJvmtiTaggingDeviceApp"],
diff --git a/hostsidetests/media/Android.bp b/hostsidetests/media/Android.bp
index b6b1a32..012284a 100644
--- a/hostsidetests/media/Android.bp
+++ b/hostsidetests/media/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
diff --git a/hostsidetests/media/app/MediaSessionTest/Android.bp b/hostsidetests/media/app/MediaSessionTest/Android.bp
index 3b2e94c..f3ea0d9 100644
--- a/hostsidetests/media/app/MediaSessionTest/Android.bp
+++ b/hostsidetests/media/app/MediaSessionTest/Android.bp
@@ -18,6 +18,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: [
diff --git a/hostsidetests/media/app/MediaSessionTestHelper/Android.bp b/hostsidetests/media/app/MediaSessionTestHelper/Android.bp
index 8645ab0..4767a94 100644
--- a/hostsidetests/media/app/MediaSessionTestHelper/Android.bp
+++ b/hostsidetests/media/app/MediaSessionTestHelper/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/media/bitstreams/Android.bp b/hostsidetests/media/bitstreams/Android.bp
index 186a0ef..de7245b 100644
--- a/hostsidetests/media/bitstreams/Android.bp
+++ b/hostsidetests/media/bitstreams/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
java_resources: ["DynamicConfig.xml"],
diff --git a/hostsidetests/media/bitstreams/app/Android.bp b/hostsidetests/media/bitstreams/app/Android.bp
index f7e0395..4b302c6 100644
--- a/hostsidetests/media/bitstreams/app/Android.bp
+++ b/hostsidetests/media/bitstreams/app/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/monkey/Android.bp b/hostsidetests/monkey/Android.bp
index 28b2501..f132c4f 100644
--- a/hostsidetests/monkey/Android.bp
+++ b/hostsidetests/monkey/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/monkey/test-apps/CtsMonkeyApp/Android.bp b/hostsidetests/monkey/test-apps/CtsMonkeyApp/Android.bp
index a3022eb..45b6f39 100644
--- a/hostsidetests/monkey/test-apps/CtsMonkeyApp/Android.bp
+++ b/hostsidetests/monkey/test-apps/CtsMonkeyApp/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/monkey/test-apps/CtsMonkeyApp2/Android.bp b/hostsidetests/monkey/test-apps/CtsMonkeyApp2/Android.bp
index 52c812a..0a7a41c 100644
--- a/hostsidetests/monkey/test-apps/CtsMonkeyApp2/Android.bp
+++ b/hostsidetests/monkey/test-apps/CtsMonkeyApp2/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/multiuser/Android.bp b/hostsidetests/multiuser/Android.bp
index ce653dd..745f725 100644
--- a/hostsidetests/multiuser/Android.bp
+++ b/hostsidetests/multiuser/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/net/Android.bp b/hostsidetests/net/Android.bp
index b6f5142..a8cc95b 100644
--- a/hostsidetests/net/Android.bp
+++ b/hostsidetests/net/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/net/app/Android.bp b/hostsidetests/net/app/Android.bp
index e988ea4..8b6d38b 100644
--- a/hostsidetests/net/app/Android.bp
+++ b/hostsidetests/net/app/Android.bp
@@ -36,6 +36,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/net/app2/Android.bp b/hostsidetests/net/app2/Android.bp
index 8a3c8e7..0bb0d2f 100644
--- a/hostsidetests/net/app2/Android.bp
+++ b/hostsidetests/net/app2/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
certificate: ":cts-net-app",
diff --git a/hostsidetests/numberblocking/Android.bp b/hostsidetests/numberblocking/Android.bp
index 9c50e44..9f490ee 100644
--- a/hostsidetests/numberblocking/Android.bp
+++ b/hostsidetests/numberblocking/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/numberblocking/app/Android.bp b/hostsidetests/numberblocking/app/Android.bp
index 2716f87..30e76bf 100644
--- a/hostsidetests/numberblocking/app/Android.bp
+++ b/hostsidetests/numberblocking/app/Android.bp
@@ -30,6 +30,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/os/Android.bp b/hostsidetests/os/Android.bp
index 7bba1bf..155dc7a 100644
--- a/hostsidetests/os/Android.bp
+++ b/hostsidetests/os/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/app/Android.bp b/hostsidetests/os/app/Android.bp
index f8881a1..129cf34 100644
--- a/hostsidetests/os/app/Android.bp
+++ b/hostsidetests/os/app/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/HostLinkVerificationApp/Android.bp b/hostsidetests/os/test-apps/HostLinkVerificationApp/Android.bp
index 36f2605..e74e678 100644
--- a/hostsidetests/os/test-apps/HostLinkVerificationApp/Android.bp
+++ b/hostsidetests/os/test-apps/HostLinkVerificationApp/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/InattentiveSleepTestApp/Android.bp b/hostsidetests/os/test-apps/InattentiveSleepTestApp/Android.bp
index 1f1895d..d3105de 100644
--- a/hostsidetests/os/test-apps/InattentiveSleepTestApp/Android.bp
+++ b/hostsidetests/os/test-apps/InattentiveSleepTestApp/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
"cts_instant",
],
diff --git a/hostsidetests/os/test-apps/PowerManagerTestApp/Android.bp b/hostsidetests/os/test-apps/PowerManagerTestApp/Android.bp
index 502d708..e0bbe58 100644
--- a/hostsidetests/os/test-apps/PowerManagerTestApp/Android.bp
+++ b/hostsidetests/os/test-apps/PowerManagerTestApp/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/ProcfsTestApp/Android.bp b/hostsidetests/os/test-apps/ProcfsTestApp/Android.bp
index 990a95d..6d070a9 100644
--- a/hostsidetests/os/test-apps/ProcfsTestApp/Android.bp
+++ b/hostsidetests/os/test-apps/ProcfsTestApp/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.bp
index c7d2556..546428c 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/Android.bp
index 080fddf..0894b8b 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp3/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp3/Android.bp
index 175f5c4..8c97787 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp3/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp3/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/Android.bp
index be8f65d..dd546f0 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/Android.bp
index bc4a2e1..40f19d7 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
aaptflags: ["--shared-lib"],
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/Android.bp
index e578b5d..3ed4b3c 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
aaptflags: ["--shared-lib"],
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/Android.bp
index c46e35c..80020d7 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/Android.bp
index a3b5b5b..da1abfa 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
aaptflags: ["--shared-lib"],
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/Android.bp
index 6d42bb0..65e27c7 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
aaptflags: ["--shared-lib"],
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp7/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibProviderApp7/Android.bp
index 1ecd6c4..9124880 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibProviderApp7/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp7/Android.bp
@@ -24,6 +24,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/Android.bp b/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/Android.bp
index 88c0fb8..7f7a825 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/Android.bp b/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/Android.bp
index 97195fb..1b7bcd5 100644
--- a/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/Android.bp b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/Android.bp
index 5c6e58a..d42e0e8 100644
--- a/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibProvider1/Android.bp b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider1/Android.bp
index 8a44700..4592fef 100644
--- a/hostsidetests/os/test-apps/StaticSharedNativeLibProvider1/Android.bp
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider1/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
optimize: {
diff --git a/hostsidetests/packagemanager/codepath/Android.bp b/hostsidetests/packagemanager/codepath/Android.bp
index 7426f7c..bbb7c10 100644
--- a/hostsidetests/packagemanager/codepath/Android.bp
+++ b/hostsidetests/packagemanager/codepath/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/packagemanager/codepath/app/Android.bp b/hostsidetests/packagemanager/codepath/app/Android.bp
index 40bb86f..a3a7c48 100644
--- a/hostsidetests/packagemanager/codepath/app/Android.bp
+++ b/hostsidetests/packagemanager/codepath/app/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
static_libs: ["androidx.test.rules"],
diff --git a/hostsidetests/packagemanager/dynamicmime/Android.bp b/hostsidetests/packagemanager/dynamicmime/Android.bp
index e23c99a..2b446a6 100644
--- a/hostsidetests/packagemanager/dynamicmime/Android.bp
+++ b/hostsidetests/packagemanager/dynamicmime/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/packagemanager/dynamicmime/app/Android.bp b/hostsidetests/packagemanager/dynamicmime/app/Android.bp
index 1e983e1..b6247ff 100644
--- a/hostsidetests/packagemanager/dynamicmime/app/Android.bp
+++ b/hostsidetests/packagemanager/dynamicmime/app/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -36,6 +37,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -51,6 +53,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -66,6 +69,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
@@ -81,6 +85,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/packagemanager/dynamicmime/test/Android.bp b/hostsidetests/packagemanager/dynamicmime/test/Android.bp
index 207f050..1f694d5 100644
--- a/hostsidetests/packagemanager/dynamicmime/test/Android.bp
+++ b/hostsidetests/packagemanager/dynamicmime/test/Android.bp
@@ -28,6 +28,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/packagemanager/extractnativelibs/Android.bp b/hostsidetests/packagemanager/extractnativelibs/Android.bp
index 810312b..b40ed1b 100644
--- a/hostsidetests/packagemanager/extractnativelibs/Android.bp
+++ b/hostsidetests/packagemanager/extractnativelibs/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/packagemanager/extractnativelibs/apps/Android.bp b/hostsidetests/packagemanager/extractnativelibs/apps/Android.bp
index a00bded..71a885c 100644
--- a/hostsidetests/packagemanager/extractnativelibs/apps/Android.bp
+++ b/hostsidetests/packagemanager/extractnativelibs/apps/Android.bp
@@ -33,6 +33,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
jni_libs: [
@@ -52,6 +53,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
jni_libs: [
diff --git a/hostsidetests/sample/Android.bp b/hostsidetests/sample/Android.bp
index 72c1b0d..0cb5a2f 100644
--- a/hostsidetests/sample/Android.bp
+++ b/hostsidetests/sample/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/seccomp/Android.bp b/hostsidetests/seccomp/Android.bp
index cb61ad4..6e3d860 100644
--- a/hostsidetests/seccomp/Android.bp
+++ b/hostsidetests/seccomp/Android.bp
@@ -19,6 +19,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/seccomp/app/Android.bp b/hostsidetests/seccomp/app/Android.bp
index da78d53..6c10906 100644
--- a/hostsidetests/seccomp/app/Android.bp
+++ b/hostsidetests/seccomp/app/Android.bp
@@ -31,6 +31,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/security/Android.mk b/hostsidetests/security/Android.mk
index ca991a9..c1dab9f 100644
--- a/hostsidetests/security/Android.mk
+++ b/hostsidetests/security/Android.mk
@@ -21,7 +21,7 @@
LOCAL_MODULE_TAGS := optional
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests
# Must match the package name in CtsTestCaseList.mk
LOCAL_MODULE := CtsSecurityHostTestCases
diff --git a/hostsidetests/securitybulletin/Android.bp b/hostsidetests/securitybulletin/Android.bp
index 71839e6..7e9e5bb 100644
--- a/hostsidetests/securitybulletin/Android.bp
+++ b/hostsidetests/securitybulletin/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
"sts",
],
@@ -51,6 +52,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"sts",
],
}
diff --git a/hostsidetests/securitybulletin/test-apps/launchanywhere/Android.bp b/hostsidetests/securitybulletin/test-apps/launchanywhere/Android.bp
index 6b17058..f77ad0f 100644
--- a/hostsidetests/securitybulletin/test-apps/launchanywhere/Android.bp
+++ b/hostsidetests/securitybulletin/test-apps/launchanywhere/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"sts",
],
optimize: {
diff --git a/hostsidetests/settings/Android.bp b/hostsidetests/settings/Android.bp
index 2355982..96288a2 100644
--- a/hostsidetests/settings/Android.bp
+++ b/hostsidetests/settings/Android.bp
@@ -30,5 +30,6 @@
"cts",
"general-tests",
"vts",
+ "vts10",
],
}
diff --git a/hostsidetests/settings/app/DeviceOwnerApp/Android.bp b/hostsidetests/settings/app/DeviceOwnerApp/Android.bp
index 72e16bd..3b04513 100644
--- a/hostsidetests/settings/app/DeviceOwnerApp/Android.bp
+++ b/hostsidetests/settings/app/DeviceOwnerApp/Android.bp
@@ -39,6 +39,7 @@
"arcts",
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.bp b/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.bp
index 8a5bf93..d660c42 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.bp b/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.bp
index 73b4f75..61bb5be 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.bp b/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.bp
index 3f2b17c..b9827cc 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.bp b/hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.bp
index ee3ca9b..1ec7cb1 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.bp b/hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.bp
index 22b4be5..c4567d7 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.bp
index f8db411..447dcda 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.bp
index 1b4e96a..13835e1 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.bp
index f473520..2755174 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.bp
index 54fc458..ca2727a 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.bp
index 895d2e6..e3ffea0 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.bp
index 3b739fa..ec977b0 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.bp
index ae33f42..09bf008 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.bp
index 9906d30..328f5bb 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.bp b/hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.bp
index ce09a9c..32b185f 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
static_libs: [
diff --git a/hostsidetests/shortcuts/deviceside/multiuser/Android.bp b/hostsidetests/shortcuts/deviceside/multiuser/Android.bp
index d20151e..8eae2a8 100644
--- a/hostsidetests/shortcuts/deviceside/multiuser/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/multiuser/Android.bp
@@ -22,6 +22,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: [
diff --git a/hostsidetests/shortcuts/deviceside/upgrade/Android.bp b/hostsidetests/shortcuts/deviceside/upgrade/Android.bp
index f386a71..c94c879 100644
--- a/hostsidetests/shortcuts/deviceside/upgrade/Android.bp
+++ b/hostsidetests/shortcuts/deviceside/upgrade/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
static_libs: [
@@ -42,6 +43,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/shortcuts/hostside/Android.bp b/hostsidetests/shortcuts/hostside/Android.bp
index 2188702..62cd1dc 100644
--- a/hostsidetests/shortcuts/hostside/Android.bp
+++ b/hostsidetests/shortcuts/hostside/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/signedconfig/app/Android.bp b/hostsidetests/signedconfig/app/Android.bp
index eb00aa6..6102ed3 100644
--- a/hostsidetests/signedconfig/app/Android.bp
+++ b/hostsidetests/signedconfig/app/Android.bp
@@ -32,6 +32,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -43,6 +44,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -54,6 +56,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -65,6 +68,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -76,6 +80,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -87,6 +92,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -98,6 +104,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -109,6 +116,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -120,6 +128,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -131,6 +140,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -142,6 +152,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/signedconfig/app/build_signedconfig_apk.mk b/hostsidetests/signedconfig/app/build_signedconfig_apk.mk
index 11ffea9..d421a3e 100644
--- a/hostsidetests/signedconfig/app/build_signedconfig_apk.mk
+++ b/hostsidetests/signedconfig/app/build_signedconfig_apk.mk
@@ -17,7 +17,7 @@
LOCAL_MODULE_PATH = $(TARGET_OUT_DATA_APPS)
LOCAL_PROGUARD_ENABLED := disabled
LOCAL_DEX_PREOPT := false
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
include $(BUILD_PACKAGE)
diff --git a/hostsidetests/signedconfig/hostside/Android.bp b/hostsidetests/signedconfig/hostside/Android.bp
index 78c3b48..457f0a8 100644
--- a/hostsidetests/signedconfig/hostside/Android.bp
+++ b/hostsidetests/signedconfig/hostside/Android.bp
@@ -28,6 +28,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/statsd/Android.bp b/hostsidetests/statsd/Android.bp
index ea363e7..3b63310 100644
--- a/hostsidetests/statsd/Android.bp
+++ b/hostsidetests/statsd/Android.bp
@@ -23,6 +23,7 @@
"general-tests",
"mts",
"vts",
+ "vts10",
],
libs: [
diff --git a/hostsidetests/sustainedperf/Android.mk b/hostsidetests/sustainedperf/Android.mk
index 745a0b4..64405f3 100644
--- a/hostsidetests/sustainedperf/Android.mk
+++ b/hostsidetests/sustainedperf/Android.mk
@@ -21,7 +21,7 @@
LOCAL_MODULE_TAGS := tests
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 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 f995837..a0e5dd8 100644
--- a/hostsidetests/sustainedperf/app/Android.mk
+++ b/hostsidetests/sustainedperf/app/Android.mk
@@ -28,7 +28,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests
LOCAL_PACKAGE_NAME := CtsSustainedPerformanceDeviceTestApp
diff --git a/hostsidetests/sustainedperf/dhrystone/Android.mk b/hostsidetests/sustainedperf/dhrystone/Android.mk
index 8645318..f6ff080 100644
--- a/hostsidetests/sustainedperf/dhrystone/Android.mk
+++ b/hostsidetests/sustainedperf/dhrystone/Android.mk
@@ -15,5 +15,5 @@
LOCAL_MULTILIB := both
LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests
include $(BUILD_EXECUTABLE)
diff --git a/hostsidetests/sustainedperf/shadertoy_android/Android.mk b/hostsidetests/sustainedperf/shadertoy_android/Android.mk
index 190ce5d..a6698e7 100644
--- a/hostsidetests/sustainedperf/shadertoy_android/Android.mk
+++ b/hostsidetests/sustainedperf/shadertoy_android/Android.mk
@@ -34,6 +34,6 @@
LOCAL_MIN_SDK_VERSION := 5
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10 general-tests
include $(BUILD_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/systemui/Android.bp b/hostsidetests/systemui/Android.bp
index f263446..6123e2f 100644
--- a/hostsidetests/systemui/Android.bp
+++ b/hostsidetests/systemui/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/systemui/app/Android.bp b/hostsidetests/systemui/app/Android.bp
index 7083b80..593ada9 100644
--- a/hostsidetests/systemui/app/Android.bp
+++ b/hostsidetests/systemui/app/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/systemui/audiorecorder_app_audiorecord/Android.bp b/hostsidetests/systemui/audiorecorder_app_audiorecord/Android.bp
index c4848e8..c854520 100644
--- a/hostsidetests/systemui/audiorecorder_app_audiorecord/Android.bp
+++ b/hostsidetests/systemui/audiorecorder_app_audiorecord/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/systemui/audiorecorder_app_mediarecorder/Android.bp b/hostsidetests/systemui/audiorecorder_app_mediarecorder/Android.bp
index bc1cb75..1502245 100644
--- a/hostsidetests/systemui/audiorecorder_app_mediarecorder/Android.bp
+++ b/hostsidetests/systemui/audiorecorder_app_mediarecorder/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/telephonyprovider/Android.bp b/hostsidetests/telephonyprovider/Android.bp
index 0774c96..8e4a427 100644
--- a/hostsidetests/telephonyprovider/Android.bp
+++ b/hostsidetests/telephonyprovider/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/telephonyprovider/devicetest/Android.bp b/hostsidetests/telephonyprovider/devicetest/Android.bp
index 3424436..591b7da 100644
--- a/hostsidetests/telephonyprovider/devicetest/Android.bp
+++ b/hostsidetests/telephonyprovider/devicetest/Android.bp
@@ -31,6 +31,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/testharness/Android.bp b/hostsidetests/testharness/Android.bp
index f9534f2..c931ed4 100644
--- a/hostsidetests/testharness/Android.bp
+++ b/hostsidetests/testharness/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/testharness/app/Android.bp b/hostsidetests/testharness/app/Android.bp
index 7dda2aa..da7f5d2 100644
--- a/hostsidetests/testharness/app/Android.bp
+++ b/hostsidetests/testharness/app/Android.bp
@@ -32,6 +32,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/theme/Android.mk b/hostsidetests/theme/Android.mk
index 19d5033..1533d20 100644
--- a/hostsidetests/theme/Android.mk
+++ b/hostsidetests/theme/Android.mk
@@ -39,7 +39,7 @@
LOCAL_SDK_VERSION := current
# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts
+LOCAL_COMPATIBILITY_SUITE := cts vts vts10
include $(BUILD_CTS_HOST_JAVA_LIBRARY)
diff --git a/hostsidetests/theme/app/Android.bp b/hostsidetests/theme/app/Android.bp
index 5ad776d..c66ba67 100644
--- a/hostsidetests/theme/app/Android.bp
+++ b/hostsidetests/theme/app/Android.bp
@@ -23,6 +23,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/trustedvoice/Android.bp b/hostsidetests/trustedvoice/Android.bp
index 8394d6d..4082a8f 100644
--- a/hostsidetests/trustedvoice/Android.bp
+++ b/hostsidetests/trustedvoice/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/trustedvoice/app/Android.bp b/hostsidetests/trustedvoice/app/Android.bp
index 3841b80..00aefe3 100644
--- a/hostsidetests/trustedvoice/app/Android.bp
+++ b/hostsidetests/trustedvoice/app/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",
diff --git a/hostsidetests/tv/Android.bp b/hostsidetests/tv/Android.bp
index 01d598fe..5b50cc4 100644
--- a/hostsidetests/tv/Android.bp
+++ b/hostsidetests/tv/Android.bp
@@ -26,6 +26,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/tv/app/Android.bp b/hostsidetests/tv/app/Android.bp
index b6151be..2993dab 100644
--- a/hostsidetests/tv/app/Android.bp
+++ b/hostsidetests/tv/app/Android.bp
@@ -33,6 +33,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/tv/app2/Android.bp b/hostsidetests/tv/app2/Android.bp
index e8d31f7..9b8d4e2 100644
--- a/hostsidetests/tv/app2/Android.bp
+++ b/hostsidetests/tv/app2/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
srcs: ["src/**/*.java"],
diff --git a/hostsidetests/tzdata/Android.bp b/hostsidetests/tzdata/Android.bp
index cec8a3b..cb5540b 100644
--- a/hostsidetests/tzdata/Android.bp
+++ b/hostsidetests/tzdata/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/ui/appA/Android.bp b/hostsidetests/ui/appA/Android.bp
index 9b92163..817acfa 100644
--- a/hostsidetests/ui/appA/Android.bp
+++ b/hostsidetests/ui/appA/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/ui/appB/Android.bp b/hostsidetests/ui/appB/Android.bp
index 60f5853..204ac25 100644
--- a/hostsidetests/ui/appB/Android.bp
+++ b/hostsidetests/ui/appB/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/ui/control/Android.bp b/hostsidetests/ui/control/Android.bp
index 4ff73a0..326eba3 100644
--- a/hostsidetests/ui/control/Android.bp
+++ b/hostsidetests/ui/control/Android.bp
@@ -28,6 +28,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "test_current",
diff --git a/hostsidetests/usage/Android.bp b/hostsidetests/usage/Android.bp
index 5ebeb54..64ede38 100644
--- a/hostsidetests/usage/Android.bp
+++ b/hostsidetests/usage/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/usage/app/Android.bp b/hostsidetests/usage/app/Android.bp
index 48a30d9..79638ae 100644
--- a/hostsidetests/usage/app/Android.bp
+++ b/hostsidetests/usage/app/Android.bp
@@ -21,6 +21,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
@@ -36,6 +37,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
aaptflags: [
diff --git a/hostsidetests/usb/Android.bp b/hostsidetests/usb/Android.bp
index b2b4f4d..ca90a53 100644
--- a/hostsidetests/usb/Android.bp
+++ b/hostsidetests/usb/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/usb/SerialTestApp/Android.bp b/hostsidetests/usb/SerialTestApp/Android.bp
index eeb7d6e..f0166b6 100644
--- a/hostsidetests/usb/SerialTestApp/Android.bp
+++ b/hostsidetests/usb/SerialTestApp/Android.bp
@@ -27,6 +27,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/webkit/Android.bp b/hostsidetests/webkit/Android.bp
index 2dfbbb3..f0149e3 100644
--- a/hostsidetests/webkit/Android.bp
+++ b/hostsidetests/webkit/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/webkit/app/Android.bp b/hostsidetests/webkit/app/Android.bp
index b2ed224..1949937 100644
--- a/hostsidetests/webkit/app/Android.bp
+++ b/hostsidetests/webkit/app/Android.bp
@@ -34,6 +34,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
}
diff --git a/hostsidetests/wifibroadcasts/Android.bp b/hostsidetests/wifibroadcasts/Android.bp
index fd79d57..680e585 100644
--- a/hostsidetests/wifibroadcasts/Android.bp
+++ b/hostsidetests/wifibroadcasts/Android.bp
@@ -20,6 +20,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
libs: [
diff --git a/hostsidetests/wifibroadcasts/app/Android.bp b/hostsidetests/wifibroadcasts/app/Android.bp
index 7cc4c92..c2d2e46 100644
--- a/hostsidetests/wifibroadcasts/app/Android.bp
+++ b/hostsidetests/wifibroadcasts/app/Android.bp
@@ -25,6 +25,7 @@
test_suites: [
"cts",
"vts",
+ "vts10",
"general-tests",
],
sdk_version: "current",