From a8814e51bebec807d98b46f56e1bc0037704938a Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Thu, 6 Aug 2020 23:34:26 +0000 Subject: [PATCH] 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 Merged-In: I6c891893398617a36f4748f185e189064ba4d4ee --- audio/common/7.0/Android.bp | 13 +++++++++++++ audio/common/all-versions/default/Android.bp | 15 ++++++++------- audio/core/all-versions/default/Android.bp | 1 + .../all-versions/vts/functional/Android.bp | 1 + audio/effect/all-versions/default/Android.bp | 11 ++++++----- .../all-versions/vts/functional/Android.bp | 18 +++++++++++------- 6 files changed, 40 insertions(+), 19 deletions(-) diff --git a/audio/common/7.0/Android.bp b/audio/common/7.0/Android.bp index eef563fecd..e24871c8b5 100644 --- a/audio/common/7.0/Android.bp +++ b/audio/common/7.0/Android.bp @@ -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", + ], +} diff --git a/audio/common/all-versions/default/Android.bp b/audio/common/all-versions/default/Android.bp index 5caddcf3fa..a72c8dc989 100644 --- a/audio/common/all-versions/default/Android.bp +++ b/audio/common/all-versions/default/Android.bp @@ -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", - ] + ], } diff --git a/audio/core/all-versions/default/Android.bp b/audio/core/all-versions/default/Android.bp index 46f64b70f3..6be0628b35 100644 --- a/audio/core/all-versions/default/Android.bp +++ b/audio/core/all-versions/default/Android.bp @@ -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: [ diff --git a/audio/core/all-versions/vts/functional/Android.bp b/audio/core/all-versions/vts/functional/Android.bp index 598944a80f..6ac9b20f95 100644 --- a/audio/core/all-versions/vts/functional/Android.bp +++ b/audio/core/all-versions/vts/functional/Android.bp @@ -130,6 +130,7 @@ cc_test { } cc_test { + enabled: false, name: "VtsHalAudioV7_0TargetTest", defaults: ["VtsHalAudioTargetTest_defaults"], srcs: [ diff --git a/audio/effect/all-versions/default/Android.bp b/audio/effect/all-versions/default/Android.bp index 01392bd13a..1c3dc74f17 100644 --- a/audio/effect/all-versions/default/Android.bp +++ b/audio/effect/all-versions/default/Android.bp @@ -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", - ] + ], } diff --git a/audio/effect/all-versions/vts/functional/Android.bp b/audio/effect/all-versions/vts/functional/Android.bp index 6a1d6a3f04..7cdb18f95f 100644 --- a/audio/effect/all-versions/vts/functional/Android.bp +++ b/audio/effect/all-versions/vts/functional/Android.bp @@ -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", - ] + ], }