Audio: Build file updates

Add target for the library with code generated by xsdc.

Temporarily disable default implementation and VTS targets.

Bug: 142480271
Test: m
Change-Id: I6c891893398617a36f4748f185e189064ba4d4ee
This commit is contained in:
Mikhail Naganov
2020-08-06 23:34:26 +00:00
parent 159260c586
commit 6cd03bfdb9
6 changed files with 40 additions and 19 deletions

View File

@@ -12,3 +12,16 @@ hidl_interface {
gen_java: true,
gen_java_constants: true,
}
cc_library {
name: "android.hardware.audio.common@7.0-enums",
vendor_available: true,
generated_sources: ["audio_policy_configuration_V7_0"],
generated_headers: ["audio_policy_configuration_V7_0"],
header_libs: ["libxsdc-utils"],
shared_libs: [
"libbase",
"liblog",
"libxml2",
],
}

View File

@@ -36,7 +36,7 @@ cc_library_shared {
],
export_header_lib_headers: [
"android.hardware.audio.common.util@all-versions",
]
],
}
cc_defaults {
@@ -57,7 +57,7 @@ cc_defaults {
"android.hardware.audio.common-util",
],
export_shared_lib_headers: [
"android.hardware.audio.common-util"
"android.hardware.audio.common-util",
],
header_libs: [
@@ -76,7 +76,7 @@ cc_library_shared {
"-DMAJOR_VERSION=2",
"-DMINOR_VERSION=0",
"-include common/all-versions/VersionMacro.h",
]
],
}
cc_library_shared {
@@ -89,7 +89,7 @@ cc_library_shared {
"-DMAJOR_VERSION=4",
"-DMINOR_VERSION=0",
"-include common/all-versions/VersionMacro.h",
]
],
}
cc_library_shared {
@@ -102,7 +102,7 @@ cc_library_shared {
"-DMAJOR_VERSION=5",
"-DMINOR_VERSION=0",
"-include common/all-versions/VersionMacro.h",
]
],
}
cc_library_shared {
@@ -115,10 +115,11 @@ cc_library_shared {
"-DMAJOR_VERSION=6",
"-DMINOR_VERSION=0",
"-include common/all-versions/VersionMacro.h",
]
],
}
cc_library_shared {
enabled: false,
name: "android.hardware.audio.common@7.0-util",
defaults: ["android.hardware.audio.common-util_default"],
shared_libs: [
@@ -128,5 +129,5 @@ cc_library_shared {
"-DMAJOR_VERSION=7",
"-DMINOR_VERSION=0",
"-include common/all-versions/VersionMacro.h",
]
],
}

View File

@@ -125,6 +125,7 @@ cc_library_shared {
}
cc_library_shared {
enabled: false,
name: "android.hardware.audio@7.0-impl",
defaults: ["android.hardware.audio-impl_default"],
shared_libs: [

View File

@@ -130,6 +130,7 @@ cc_test {
}
cc_test {
enabled: false,
name: "VtsHalAudioV7_0TargetTest",
defaults: ["VtsHalAudioTargetTest_defaults"],
srcs: [

View File

@@ -56,7 +56,7 @@ cc_library_shared {
"-DMAJOR_VERSION=2",
"-DMINOR_VERSION=0",
"-include common/all-versions/VersionMacro.h",
]
],
}
cc_library_shared {
@@ -71,7 +71,7 @@ cc_library_shared {
"-DMAJOR_VERSION=4",
"-DMINOR_VERSION=0",
"-include common/all-versions/VersionMacro.h",
]
],
}
cc_library_shared {
@@ -86,7 +86,7 @@ cc_library_shared {
"-DMAJOR_VERSION=5",
"-DMINOR_VERSION=0",
"-include common/all-versions/VersionMacro.h",
]
],
}
cc_library_shared {
@@ -101,10 +101,11 @@ cc_library_shared {
"-DMAJOR_VERSION=6",
"-DMINOR_VERSION=0",
"-include common/all-versions/VersionMacro.h",
]
],
}
cc_library_shared {
enabled: false,
name: "android.hardware.audio.effect@7.0-impl",
defaults: ["android.hardware.audio.effect-impl_default"],
shared_libs: [
@@ -116,5 +117,5 @@ cc_library_shared {
"-DMAJOR_VERSION=7",
"-DMINOR_VERSION=0",
"-include common/all-versions/VersionMacro.h",
]
],
}

View File

@@ -19,7 +19,7 @@ cc_defaults {
defaults: ["VtsHalTargetTestDefaults"],
srcs: [
"VtsHalAudioEffectTargetTest.cpp",
"ValidateAudioEffectsConfiguration.cpp"
"ValidateAudioEffectsConfiguration.cpp",
],
static_libs: [
"android.hardware.audio.common.test.utility",
@@ -31,7 +31,10 @@ cc_defaults {
header_libs: [
"android.hardware.audio.common.util@all-versions",
],
test_suites: ["general-tests", "vts"],
test_suites: [
"general-tests",
"vts",
],
}
cc_test {
@@ -51,7 +54,7 @@ cc_test {
"-DMAJOR_VERSION=2",
"-DMINOR_VERSION=0",
"-include common/all-versions/VersionMacro.h",
]
],
}
cc_test {
@@ -71,7 +74,7 @@ cc_test {
"-DMAJOR_VERSION=4",
"-DMINOR_VERSION=0",
"-include common/all-versions/VersionMacro.h",
]
],
}
cc_test {
@@ -91,7 +94,7 @@ cc_test {
"-DMAJOR_VERSION=5",
"-DMINOR_VERSION=0",
"-include common/all-versions/VersionMacro.h",
]
],
}
cc_test {
@@ -111,10 +114,11 @@ cc_test {
"-DMAJOR_VERSION=6",
"-DMINOR_VERSION=0",
"-include common/all-versions/VersionMacro.h",
]
],
}
cc_test {
enabled: false,
name: "VtsHalAudioEffectV7_0TargetTest",
defaults: ["VtsHalAudioEffectTargetTest_default"],
// Use test_config for vts suite.
@@ -131,5 +135,5 @@ cc_test {
"-DMAJOR_VERSION=7",
"-DMINOR_VERSION=0",
"-include common/all-versions/VersionMacro.h",
]
],
}