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

Commit e8764439 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[vts-core] add VtsHalAudioEffectV*_0TargetTest to vts-core" am: 4472878a am: 96dd61d2 

Change-Id: I8841dfe4b46102173e64755dfe36b09e32af6ee5
parents ef9e0c98 96dd61d2

audio/effect/2.0/xml/Android.bp

0 → 100644
+8 −0
Original line number Diff line number Diff line 
genrule {

    name: "audio_effects_conf_V2_0",

    srcs: ["audio_effects_conf.xsd"],

    out: [

        "audio_effects_conf_V2_0.xsd",

    ],

    cmd: "cp -f $(in) $(genDir)/audio_effects_conf_V2_0.xsd",

}

audio/effect/4.0/xml/Android.bp

0 → 100644
+8 −0
Original line number Diff line number Diff line 
genrule {

    name: "audio_effects_conf_V4_0",

    srcs: ["audio_effects_conf.xsd"],

    out: [

        "audio_effects_conf_V4_0.xsd",

    ],

    cmd: "cp -f $(in) $(genDir)/audio_effects_conf_V4_0.xsd",

}

audio/effect/5.0/xml/Android.bp

+0 −1
Original line number Diff line number Diff line 


xsd_config {

    name: "audio_effects_conf_V5_0",

    srcs: ["audio_effects_conf.xsd"],

audio/effect/6.0/xml/Android.bp

+0 −1
Original line number Diff line number Diff line 


xsd_config {

    name: "audio_effects_conf_V6_0",

    srcs: ["audio_effects_conf.xsd"],

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

+25 −1
Original line number Diff line number Diff line
@@ -31,16 +31,22 @@ cc_defaults { 
    header_libs: [

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

    ],

    test_suites: ["general-tests"],

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

}



cc_test {

    name: "VtsHalAudioEffectV2_0TargetTest",

    defaults: ["VtsHalAudioEffectTargetTest_default"],

    // Use test_config for vts-core suite.

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

    test_config: "VtsHalAudioEffectV2_0TargetTest.xml",

    static_libs: [

        "android.hardware.audio.common@2.0",

        "android.hardware.audio.effect@2.0",

    ],

    data: [

        ":audio_effects_conf_V2_0",

    ],

    cflags: [

        "-DMAJOR_VERSION=2",

        "-DMINOR_VERSION=0",
@@ -51,10 +57,16 @@ cc_test { 
cc_test {

    name: "VtsHalAudioEffectV4_0TargetTest",

    defaults: ["VtsHalAudioEffectTargetTest_default"],

    // Use test_config for vts-core suite.

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

    test_config: "VtsHalAudioEffectV4_0TargetTest.xml",

    static_libs: [

        "android.hardware.audio.common@4.0",

        "android.hardware.audio.effect@4.0",

    ],

    data: [

        ":audio_effects_conf_V4_0",

    ],

    cflags: [

        "-DMAJOR_VERSION=4",

        "-DMINOR_VERSION=0",
@@ -65,10 +77,16 @@ cc_test { 
cc_test {

    name: "VtsHalAudioEffectV5_0TargetTest",

    defaults: ["VtsHalAudioEffectTargetTest_default"],

    // Use test_config for vts-core suite.

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

    test_config: "VtsHalAudioEffectV5_0TargetTest.xml",

    static_libs: [

        "android.hardware.audio.common@5.0",

        "android.hardware.audio.effect@5.0",

    ],

    data: [

        ":audio_effects_conf_V5_0",

    ],

    cflags: [

        "-DMAJOR_VERSION=5",

        "-DMINOR_VERSION=0",
@@ -79,10 +97,16 @@ cc_test { 
cc_test {

    name: "VtsHalAudioEffectV6_0TargetTest",

    defaults: ["VtsHalAudioEffectTargetTest_default"],

    // Use test_config for vts-core suite.

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

    test_config: "VtsHalAudioEffectV6_0TargetTest.xml",

    static_libs: [

        "android.hardware.audio.common@6.0",

        "android.hardware.audio.effect@6.0",

    ],

    data: [

        ":audio_effects_conf_V6_0",

    ],

    cflags: [

        "-DMAJOR_VERSION=6",

        "-DMINOR_VERSION=0",