diff --git a/audio/7.0/config/Android.bp b/audio/7.0/config/Android.bp index 8e87ae06e3..096ab6aec7 100644 --- a/audio/7.0/config/Android.bp +++ b/audio/7.0/config/Android.bp @@ -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, +} diff --git a/audio/common/7.0/Android.bp b/audio/common/7.0/Android.bp index f40f9d1a99..2f7665e502 100644 --- a/audio/common/7.0/Android.bp +++ b/audio/common/7.0/Android.bp @@ -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", ], } 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 93810fb204..a85e4faae8 100644 --- a/audio/common/7.0/example/Android.bp +++ b/audio/common/7.0/example/Android.bp @@ -44,7 +44,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 47d4f97620..8f557449f1 100644 --- a/audio/common/all-versions/default/Android.bp +++ b/audio/common/all-versions/default/Android.bp @@ -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", diff --git a/audio/core/all-versions/default/Android.bp b/audio/core/all-versions/default/Android.bp index 0aa77d3b35..f61964eda7 100644 --- a/audio/core/all-versions/default/Android.bp +++ b/audio/core/all-versions/default/Android.bp @@ -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", diff --git a/audio/core/all-versions/default/util/Android.bp b/audio/core/all-versions/default/util/Android.bp index d0de767672..7caf18ddfd 100644 --- a/audio/core/all-versions/default/util/Android.bp +++ b/audio/core/all-versions/default/util/Android.bp @@ -104,7 +104,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 109427b43a..4520dc3f8d 100644 --- a/audio/core/all-versions/vts/functional/Android.bp +++ b/audio/core/all-versions/vts/functional/Android.bp @@ -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", 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