Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "audio: Remove dependency on libxml2 from the default implementation"

Browse Source
This commit is contained in:
Treehugger Robot
2021-02-23 00:14:51 +00:00
committed by Gerrit Code Review
parent 89db74b504 bc35c9c725
commit 3731b18cfc
10 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
audio/7.0/config/Android.bp
View File

@@ -13,3 +13,19 @@ xsd_config {
package_name: "android.audio.policy.configuration.V7_0",
nullability: true,
}
xsd_config {
name: "audio_policy_configuration_V7_0_enums",
srcs: ["audio_policy_configuration.xsd"],
package_name: "android.audio.policy.configuration.V7_0",
nullability: true,
enums_only: true,
}
xsd_config {
name: "audio_policy_configuration_V7_0_parser",
srcs: ["audio_policy_configuration.xsd"],
package_name: "android.audio.policy.configuration.V7_0",
nullability: true,
parser_only: true,
}

7
audio/common/7.0/Android.bp
View File

@@ -25,15 +25,14 @@ hidl_interface {
cc_library {
name: "android.hardware.audio.common@7.0-enums",
vendor_available: true,
generated_headers: ["audio_policy_configuration_V7_0"],
generated_sources: ["audio_policy_configuration_V7_0"],
generated_headers: ["audio_policy_configuration_V7_0_enums"],
generated_sources: ["audio_policy_configuration_V7_0_enums"],
header_libs: ["libxsdc-utils"],
export_generated_headers: ["audio_policy_configuration_V7_0"],
export_generated_headers: ["audio_policy_configuration_V7_0_enums"],
export_header_lib_headers: ["libxsdc-utils"],
export_include_dirs: ["enums/include"],
shared_libs: [
"libbase",
"liblog",
"libxml2",
],
}

8
audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
#ifndef ANDROID_AUDIO_POLICY_CONFIGURATION_V7_0_ENUMS_H
#define ANDROID_AUDIO_POLICY_CONFIGURATION_V7_0_ENUMS_H
#ifndef ANDROID_AUDIO_POLICY_CONFIGURATION_V7_0__ENUMS_H
#define ANDROID_AUDIO_POLICY_CONFIGURATION_V7_0__ENUMS_H
#include <sys/types.h>
#include <algorithm>
#include <cctype>
#include <android_audio_policy_configuration_V7_0.h>
#include <android_audio_policy_configuration_V7_0_enums.h>
namespace android::audio::policy::configuration::V7_0 {
@@ -264,4 +264,4 @@ static inline bool isUnknownAudioUsage(const std::string& usage) {
} // namespace android::audio::policy::configuration::V7_0
#endif // ANDROID_AUDIO_POLICY_CONFIGURATION_V7_0_ENUMS_H
#endif // ANDROID_AUDIO_POLICY_CONFIGURATION_V7_0__ENUMS_H

1
audio/common/7.0/example/Android.bp
View File

@@ -44,7 +44,6 @@ cc_binary {
"libcutils",
"libhidlbase",
"liblog",
"libxml2",
"libutils",
"android.hardware.audio@7.0",
"android.hardware.audio.common@7.0",

2
audio/common/7.0/example/Effect.cpp
View File

@@ -17,7 +17,7 @@
#define LOG_TAG "EffectsFactory7.0"
#include <log/log.h>
#include <android_audio_policy_configuration_V7_0.h>
#include <android_audio_policy_configuration_V7_0-enums.h>
#include "Effect.h"

1
audio/common/all-versions/default/Android.bp
View File

@@ -149,7 +149,6 @@ cc_library {
"android.hardware.audio.common@7.0",
"android.hardware.audio.common@7.0-enums",
"libbase",
"libxml2",
],
cflags: [
"-DMAJOR_VERSION=7",

1
audio/core/all-versions/default/Android.bp
View File

@@ -146,7 +146,6 @@ cc_library_shared {
"android.hardware.audio.common@7.0-enums",
"android.hardware.audio.common@7.0-util",
"libbase",
"libxml2",
],
cflags: [
"-DMAJOR_VERSION=7",

1
audio/core/all-versions/default/util/Android.bp
View File

@@ -104,7 +104,6 @@ cc_library {
"android.hardware.audio.common@7.0-util",
"android.hardware.audio@7.0",
"libbase",
"libxml2",
],
cflags: [
"-DMAJOR_VERSION=7",

2
audio/core/all-versions/vts/functional/Android.bp
View File

@@ -153,6 +153,8 @@ cc_test {
srcs: [
"7.0/AudioPrimaryHidlHalTest.cpp",
],
generated_headers: ["audio_policy_configuration_V7_0_parser"],
generated_sources: ["audio_policy_configuration_V7_0_parser"],
static_libs: [
"android.hardware.audio@7.0",
"android.hardware.audio.common@7.0",

1
audio/effect/all-versions/vts/functional/VtsHalAudioEffectTargetTest.cpp
View File

@@ -31,7 +31,6 @@
#include <android/hidl/memory/1.0/IMemory.h>
#if MAJOR_VERSION >= 7
#include <android_audio_policy_configuration_V7_0-enums.h>
#include <android_audio_policy_configuration_V7_0.h>
#endif
#include <common/all-versions/VersionUtils.h>