Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a899a38 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1595307

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c5a200a80c9f089d697ec4e0dcee0ed0561d51f
parents c7e3e264 3731b18c

audio/7.0/config/Android.bp

+16 −0
Original line number Diff line number Diff line
@@ -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,

}

audio/common/7.0/Android.bp

+3 −4
Original line number Diff line number Diff line
@@ -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",

    ],

}

audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h

+4 −4
Original line number Diff line number Diff line
@@ -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

audio/common/7.0/example/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ cc_binary { 
        "libcutils",

        "libhidlbase",

        "liblog",

        "libxml2",

        "libutils",

        "android.hardware.audio@7.0",

        "android.hardware.audio.common@7.0",

audio/common/7.0/example/Effect.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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"