resolve merge conflicts of 67de87eed0 to rvc-dev-plus-aosp

Bug: None Test: none Change-Id: Ibb8ca5e3b9d1cc7247f57d0d89bd15b9f52fec92 Exempt-From-Owner-Approval: address merge conflict in tests/tests/security/Android.bp
2020-03-23 11:04:49 -07:00
parent 7edbf2d9a8 67de87eed0
commit b5fdbb40bb
7 changed files with 7 additions and 0 deletions
--- a/tests/cts/hostside/Android.bp
+++ b/tests/cts/hostside/Android.bp
@@ -25,6 +25,7 @@ java_test_host {
    test_suites: [
        "cts",
        "vts",
+        "vts10",
        "general-tests",
    ],
 }
--- a/tests/cts/hostside/app/Android.bp
+++ b/tests/cts/hostside/app/Android.bp
@@ -36,6 +36,7 @@ android_test_helper_app {
    test_suites: [
        "cts",
        "vts",
+        "vts10",
        "general-tests",
    ],
 }
--- a/tests/cts/hostside/app2/Android.bp
+++ b/tests/cts/hostside/app2/Android.bp
@@ -24,6 +24,7 @@ android_test_helper_app {
    test_suites: [
        "cts",
        "vts",
+        "vts10",
        "general-tests",
    ],
    certificate: ":cts-net-app",
--- a/tests/cts/net/Android.bp
+++ b/tests/cts/net/Android.bp
@@ -65,6 +65,7 @@ android_test {
    test_suites: [
        "cts",
        "vts",
+        "vts10",
        "general-tests",
    ],
    test_config_template: "AndroidTestTemplate.xml",
--- a/tests/cts/net/api23Test/Android.bp
+++ b/tests/cts/net/api23Test/Android.bp
@@ -46,6 +46,7 @@ android_test {
    test_suites: [
        "cts",
        "vts",
+        "vts10",
        "general-tests",
    ],

--- a/tests/cts/net/appForApi23/Android.bp
+++ b/tests/cts/net/appForApi23/Android.bp
@@ -27,6 +27,7 @@ android_test {
    test_suites: [
        "cts",
        "vts",
+        "vts10",
        "general-tests",
    ],

--- a/tests/cts/net/native/qtaguid/Android.bp
+++ b/tests/cts/net/native/qtaguid/Android.bp
@@ -43,6 +43,7 @@ cc_test {
    test_suites: [
        "cts",
        "vts",
+        "vts10",
    ],

    cflags: [