Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba9fb3af authored by Dan Shi's avatar Dan Shi Committed by Automerger Merge Worker
Browse files

Merge "Rename vts-core to vts" into rvc-dev am: 4c6e4c7e am: 8f18fba4 am: 57b39177 

Change-Id: I5849be59eac5a3887227e73046185560175bbc4a
parents 8a14f47a 57b39177

atrace/1.0/vts/functional/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,5 +19,5 @@ cc_test { 
    defaults: ["VtsHalTargetTestDefaults"],

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: ["VtsHalAtraceV1_0TargetTest.cpp"],

    srcs: ["VtsHalAtraceV1_0TargetTest.cpp"],

    static_libs: ["android.hardware.atrace@1.0"],

    static_libs: ["android.hardware.atrace@1.0"],

    test_suites: ["general-tests", "vts-core"],

    test_suites: ["general-tests", "vts"],

}
 
}

audio/effect/all-versions/vts/functional/Android.bp

+5 −5
Original line number Original line Diff line number Diff line
@@ -31,13 +31,13 @@ cc_defaults { 
    header_libs: [

    header_libs: [

        "android.hardware.audio.common.util@all-versions",

        "android.hardware.audio.common.util@all-versions",

    ],

    ],

    test_suites: ["general-tests", "vts-core"],

    test_suites: ["general-tests", "vts"],

}

}





cc_test {

cc_test {

    name: "VtsHalAudioEffectV2_0TargetTest",

    name: "VtsHalAudioEffectV2_0TargetTest",

    defaults: ["VtsHalAudioEffectTargetTest_default"],

    defaults: ["VtsHalAudioEffectTargetTest_default"],

    // Use test_config for vts-core suite.

    // Use test_config for vts suite.

    // TODO(b/146104851): Add auto-gen rules and remove it.

    // TODO(b/146104851): Add auto-gen rules and remove it.

    test_config: "VtsHalAudioEffectV2_0TargetTest.xml",

    test_config: "VtsHalAudioEffectV2_0TargetTest.xml",

    static_libs: [

    static_libs: [
@@ -57,7 +57,7 @@ cc_test { 
cc_test {

cc_test {

    name: "VtsHalAudioEffectV4_0TargetTest",

    name: "VtsHalAudioEffectV4_0TargetTest",

    defaults: ["VtsHalAudioEffectTargetTest_default"],

    defaults: ["VtsHalAudioEffectTargetTest_default"],

    // Use test_config for vts-core suite.

    // Use test_config for vts suite.

    // TODO(b/146104851): Add auto-gen rules and remove it.

    // TODO(b/146104851): Add auto-gen rules and remove it.

    test_config: "VtsHalAudioEffectV4_0TargetTest.xml",

    test_config: "VtsHalAudioEffectV4_0TargetTest.xml",

    static_libs: [

    static_libs: [
@@ -77,7 +77,7 @@ cc_test { 
cc_test {

cc_test {

    name: "VtsHalAudioEffectV5_0TargetTest",

    name: "VtsHalAudioEffectV5_0TargetTest",

    defaults: ["VtsHalAudioEffectTargetTest_default"],

    defaults: ["VtsHalAudioEffectTargetTest_default"],

    // Use test_config for vts-core suite.

    // Use test_config for vts suite.

    // TODO(b/146104851): Add auto-gen rules and remove it.

    // TODO(b/146104851): Add auto-gen rules and remove it.

    test_config: "VtsHalAudioEffectV5_0TargetTest.xml",

    test_config: "VtsHalAudioEffectV5_0TargetTest.xml",

    static_libs: [

    static_libs: [
@@ -97,7 +97,7 @@ cc_test { 
cc_test {

cc_test {

    name: "VtsHalAudioEffectV6_0TargetTest",

    name: "VtsHalAudioEffectV6_0TargetTest",

    defaults: ["VtsHalAudioEffectTargetTest_default"],

    defaults: ["VtsHalAudioEffectTargetTest_default"],

    // Use test_config for vts-core suite.

    // Use test_config for vts suite.

    // TODO(b/146104851): Add auto-gen rules and remove it.

    // TODO(b/146104851): Add auto-gen rules and remove it.

    test_config: "VtsHalAudioEffectV6_0TargetTest.xml",

    test_config: "VtsHalAudioEffectV6_0TargetTest.xml",

    static_libs: [

    static_libs: [

audio/policy/1.0/vts/functional/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ cc_test { 
    shared_libs: [

    shared_libs: [

        "libaudiofoundation",

        "libaudiofoundation",

    ],

    ],

    // Use test_config for vts-core suite.

    // Use test_config for vts suite.

    // TODO(b/146104851): Add auto-gen rules and remove it.

    // TODO(b/146104851): Add auto-gen rules and remove it.

    test_config: "VtsHalAudioPolicyV1_0TargetTest.xml",

    test_config: "VtsHalAudioPolicyV1_0TargetTest.xml",

    cflags: [

    cflags: [
@@ -54,6 +54,6 @@ cc_test { 
    gtest: true,

    gtest: true,

    test_suites: [

    test_suites: [

        "general-tests",

        "general-tests",

        "vts-core",

        "vts",

    ],

    ],

}
 
}

authsecret/1.0/vts/functional/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ cc_test { 
    static_libs: ["android.hardware.authsecret@1.0"],

    static_libs: ["android.hardware.authsecret@1.0"],

    test_suites: [

    test_suites: [

        "general-tests",

        "general-tests",

        "vts-core",

        "vts",

    ],

    ],

    require_root: true,

    require_root: true,

}
 
}

automotive/audiocontrol/2.0/vts/functional/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,6 @@ cc_test { 
    ],

    ],

    test_suites: [

    test_suites: [

        "general-tests",

        "general-tests",

        "vts-core",

        "vts",

    ],

    ],

}
 
}