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

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

Merge changes I146430a1,I60d41eaa into qt-dev 

* changes:
  audiopolicy: engineconfigurable: align with PFW unix socket convention
  audiopolicy: fix build issue by going on switching to bp
parents 9602d9c3 dcfecd0d

services/audiopolicy/Android.bp

0 → 100644
+5 −0
Original line number Diff line number Diff line 
cc_library_headers {

    name: "libaudiopolicymanager_interface_headers",

    host_supported: true,

    export_include_dirs: ["."],

}

services/audiopolicy/common/managerdefinitions/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ cc_library_static { 
    ],

    header_libs: [

        "libaudiopolicycommon",

        "libaudiopolicymanager_interface_headers",

    ],

    export_header_lib_headers: ["libaudiopolicycommon"],

services/audiopolicy/engine/Android.mk

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 


LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



#######################################################################

# Recursive call sub-folder Android.mk

#

include $(call all-makefiles-under,$(LOCAL_PATH))

services/audiopolicy/engineconfigurable/Android.bp

0 → 100644
+44 −0
Original line number Diff line number Diff line 
cc_library_headers {

    name: "libaudiopolicyengineconfigurable_interface_headers",

    host_supported: true,

    export_include_dirs: ["interface"],

}



cc_library_shared {

    name: "libaudiopolicyengineconfigurable",

    export_include_dirs: ["include"],

    srcs: [

        "src/Engine.cpp",

        "src/EngineInstance.cpp",

        "src/Stream.cpp",

        "src/InputSource.cpp",

    ],

    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

    ],

    local_include_dirs: ["include"],

    header_libs: [

        "libbase_headers",

        "libaudiopolicycommon",

        "libaudiopolicyengine_interface_headers",

        "libaudiopolicyengineconfigurable_interface_headers",

    ],

    static_libs: [

        "libaudiopolicycomponents",

        "libaudiopolicyengine_common",

        "libaudiopolicyengine_config",

        "libaudiopolicyengineconfigurable_pfwwrapper",



    ],

    shared_libs: [

        "liblog",

        "libcutils",

        "libutils",

        "libmedia_helper",

        "libaudiopolicy",

        "libparameter",

        "libxml2",

    ],

}

services/audiopolicy/engineconfigurable/Android.mk

deleted100644 → 0
+0 −67
Original line number Diff line number Diff line 
ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1)



LOCAL_PATH := $(call my-dir)



# Component build

#######################################################################



include $(CLEAR_VARS)



LOCAL_SRC_FILES := \

    src/Engine.cpp \

    src/EngineInstance.cpp \

    src/Stream.cpp \

    src/InputSource.cpp \



audio_policy_engine_includes_common := \

    frameworks/av/services/audiopolicy/engineconfigurable/include \

    frameworks/av/services/audiopolicy/engineconfigurable/interface



LOCAL_CFLAGS += \

    -Wall \

    -Werror \

    -Wextra \



LOCAL_EXPORT_C_INCLUDE_DIRS := \

    $(audio_policy_engine_includes_common)



LOCAL_C_INCLUDES := \

    $(audio_policy_engine_includes_common) \

    $(TARGET_OUT_HEADERS)/hw \

    $(call include-path-for, frameworks-av) \

    $(call include-path-for, audio-utils)



LOCAL_HEADER_LIBRARIES := \

    libaudiopolicycommon \

    libaudiopolicyengine_interface_headers



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)



LOCAL_MODULE := libaudiopolicyengineconfigurable

LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_LIBRARIES := \

    libaudiopolicypfwwrapper \

    libaudiopolicycomponents \

    libaudiopolicyengine_common \

    libaudiopolicyengine_config \



LOCAL_SHARED_LIBRARIES := \

    liblog \

    libutils \

    liblog \

    libcutils \

    libaudioutils \

    libparameter \

    libmedia_helper \

    libaudiopolicy \

    libxml2



include $(BUILD_SHARED_LIBRARY)



#######################################################################

# Recursive call sub-folder Android.mk

#

include $(call all-makefiles-under,$(LOCAL_PATH))



endif