From bc35c9c725b539248414172d5bb284bad98af755 Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Thu, 18 Feb 2021 20:54:15 -0800 Subject: [PATCH] audio: Remove dependency on libxml2 from the default implementation The default implementation switched to use the "enums" module generated from the audio_policy_configuration.xsd schema. This drops the dependency on libxml2 library and reduces PSS and private dirty memory usage. Bug: 180413957 Test: atest VtsHalAudioV7_0TargetTest Change-Id: If7c110cd2bd2698923957b39906a0896d18065dd --- audio/7.0/config/Android.bp | 16 ++++++++++++++++ audio/common/7.0/Android.bp | 7 +++---- ...droid_audio_policy_configuration_V7_0-enums.h | 8 ++++---- audio/common/7.0/example/Android.bp | 1 - audio/common/7.0/example/Effect.cpp | 2 +- audio/common/all-versions/default/Android.bp | 1 - audio/core/all-versions/default/Android.bp | 1 - audio/core/all-versions/default/util/Android.bp | 1 - .../core/all-versions/vts/functional/Android.bp | 2 ++ .../functional/VtsHalAudioEffectTargetTest.cpp | 1 - 10 files changed, 26 insertions(+), 14 deletions(-) diff --git a/audio/7.0/config/Android.bp b/audio/7.0/config/Android.bp index f67cc7cb49..4a46795228 100644 --- a/audio/7.0/config/Android.bp +++ b/audio/7.0/config/Android.bp @@ -4,3 +4,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, +} diff --git a/audio/common/7.0/Android.bp b/audio/common/7.0/Android.bp index 1c016b401b..47f031fd2e 100644 --- a/audio/common/7.0/Android.bp +++ b/audio/common/7.0/Android.bp @@ -16,15 +16,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", ], } diff --git a/audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h b/audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h index b427f3a0d4..7b7735ea0a 100644 --- a/audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h +++ b/audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h @@ -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 #include #include -#include +#include 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 diff --git a/audio/common/7.0/example/Android.bp b/audio/common/7.0/example/Android.bp index 03c1cd89cd..a6ae560ec5 100644 --- a/audio/common/7.0/example/Android.bp +++ b/audio/common/7.0/example/Android.bp @@ -35,7 +35,6 @@ cc_binary { "libcutils", "libhidlbase", "liblog", - "libxml2", "libutils", "android.hardware.audio@7.0", "android.hardware.audio.common@7.0", diff --git a/audio/common/7.0/example/Effect.cpp b/audio/common/7.0/example/Effect.cpp index 578881148a..0621669258 100644 --- a/audio/common/7.0/example/Effect.cpp +++ b/audio/common/7.0/example/Effect.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "EffectsFactory7.0" #include -#include +#include #include "Effect.h" diff --git a/audio/common/all-versions/default/Android.bp b/audio/common/all-versions/default/Android.bp index 29a3d6f46e..9afc95a8c9 100644 --- a/audio/common/all-versions/default/Android.bp +++ b/audio/common/all-versions/default/Android.bp @@ -140,7 +140,6 @@ cc_library { "android.hardware.audio.common@7.0", "android.hardware.audio.common@7.0-enums", "libbase", - "libxml2", ], cflags: [ "-DMAJOR_VERSION=7", diff --git a/audio/core/all-versions/default/Android.bp b/audio/core/all-versions/default/Android.bp index dcff42504f..5f495b2f49 100644 --- a/audio/core/all-versions/default/Android.bp +++ b/audio/core/all-versions/default/Android.bp @@ -137,7 +137,6 @@ cc_library_shared { "android.hardware.audio.common@7.0-enums", "android.hardware.audio.common@7.0-util", "libbase", - "libxml2", ], cflags: [ "-DMAJOR_VERSION=7", diff --git a/audio/core/all-versions/default/util/Android.bp b/audio/core/all-versions/default/util/Android.bp index 447184bbe7..ee80bbbd1a 100644 --- a/audio/core/all-versions/default/util/Android.bp +++ b/audio/core/all-versions/default/util/Android.bp @@ -95,7 +95,6 @@ cc_library { "android.hardware.audio.common@7.0-util", "android.hardware.audio@7.0", "libbase", - "libxml2", ], cflags: [ "-DMAJOR_VERSION=7", diff --git a/audio/core/all-versions/vts/functional/Android.bp b/audio/core/all-versions/vts/functional/Android.bp index c7bfe08889..0e37767288 100644 --- a/audio/core/all-versions/vts/functional/Android.bp +++ b/audio/core/all-versions/vts/functional/Android.bp @@ -144,6 +144,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", diff --git a/audio/effect/all-versions/vts/functional/VtsHalAudioEffectTargetTest.cpp b/audio/effect/all-versions/vts/functional/VtsHalAudioEffectTargetTest.cpp index 15a2fd928c..23e77867a5 100644 --- a/audio/effect/all-versions/vts/functional/VtsHalAudioEffectTargetTest.cpp +++ b/audio/effect/all-versions/vts/functional/VtsHalAudioEffectTargetTest.cpp @@ -31,7 +31,6 @@ #include #if MAJOR_VERSION >= 7 #include -#include #endif #include