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

Commit 157c4677 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge changes from topic "remove_hard_coded_attributes" 

* changes:
  audio: get rid of hardcoded translation stream <--> attributes
  audiopolicy: engine: remove deprecated APIs
  audiopolicy: exclusive Preferred Device
  audiopolicy: apm: switch to new Engine APIs
  audio policy service: Add introspection API to retrieve AudioProductStrategies
  audiopolicy: engineconfigurable: Merge Policy Engine and Wrapper configuration files
  audiopolicy: engineconfigurable: add configuration of ProductStrategies
  audiopolicy: engine: Add ProductStrategy common code
parents d64607b6 58d4be5a

include/media/AudioAttributes.h

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../media/libaudioclient/include/media/AudioAttributes.h
 
 No newline at end of file

include/media/AudioCommonTypes.h

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../media/libaudioclient/include/media/AudioCommonTypes.h
 
 No newline at end of file

include/media/AudioPolicyHelper.h

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../media/libaudioclient/include/media/AudioPolicyHelper.h
 
 No newline at end of file

include/media/AudioProductStrategy.h

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../media/libaudioclient/include/media/AudioProductStrategy.h
 
 No newline at end of file

media/libaudioclient/Android.bp

+23 −1
Original line number Diff line number Diff line
@@ -4,6 +4,28 @@ cc_library_headers { 
    export_include_dirs: ["include"],

}



cc_library_shared {

    name: "libaudiopolicy",

    srcs: [

        "AudioAttributes.cpp",

        "AudioPolicy.cpp",

        "AudioProductStrategy.cpp",

    ],

    shared_libs: [

        "libaudioutils",

        "libbinder",

        "libcutils",

        "liblog",

        "libutils",

    ],

    cflags: [

        "-Werror",

        "-Wall",

    ],

    include_dirs: ["system/media/audio_utils/include"],

    export_include_dirs: ["include"],

}



cc_library_shared {

    name: "libaudioclient",
@@ -23,7 +45,6 @@ cc_library_shared { 
        ":libaudioclient_aidl",



        "AudioEffect.cpp",

        "AudioPolicy.cpp",

        "AudioRecord.cpp",

        "AudioSystem.cpp",

        "AudioTrack.cpp",
@@ -41,6 +62,7 @@ cc_library_shared { 
    ],

    shared_libs: [

        "libaudioutils",

        "libaudiopolicy",

        "libaudiomanager",

        "libbinder",

        "libcutils",