- Renamed libaudiopolicyengineconfig to libaudiopolicyengine_config in order to match names libaudiopolicyengine_{common|interface}. - Made libaudiopolicyengine_config static to avoid .so overhead. - Added a cleanspec for it. - Added libaudiopolicyengine_common which includes source files previously included directly into engineconfigurable and enginedefault libraries. Bug: 121208203 Test: make & flash crosshatch Change-Id: If3b7b89fcbd5752ddfdeca6c164a88f55bc35811gugelfrei
parent
e1e9cad4d0
commit
13ce4f6703
@ -0,0 +1,31 @@
|
||||
cc_library_static {
|
||||
name: "libaudiopolicyengine_config",
|
||||
export_include_dirs: ["include"],
|
||||
include_dirs: [
|
||||
"external/libxml2/include",
|
||||
"external/icu/icu4c/source/common",
|
||||
],
|
||||
srcs: [
|
||||
"src/EngineConfig.cpp",
|
||||
],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
"-Wextra",
|
||||
],
|
||||
shared_libs: [
|
||||
"libmedia_helper",
|
||||
"libandroidicu",
|
||||
"libxml2",
|
||||
"libutils",
|
||||
"liblog",
|
||||
"libcutils",
|
||||
],
|
||||
static_libs: [
|
||||
"libaudiopolicycomponents",
|
||||
],
|
||||
header_libs: [
|
||||
"libaudio_system_headers",
|
||||
"libaudiopolicycommon",
|
||||
],
|
||||
}
|
@ -1,42 +0,0 @@
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
##################################################################
|
||||
# Component build
|
||||
##################################################################
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
|
||||
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_EXPORT_C_INCLUDE_DIRS) \
|
||||
external/libxml2/include \
|
||||
external/icu/icu4c/source/common
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
src/EngineConfig.cpp
|
||||
|
||||
LOCAL_CFLAGS += -Wall -Werror -Wextra
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
libmedia_helper \
|
||||
libandroidicu \
|
||||
libxml2 \
|
||||
libutils \
|
||||
liblog \
|
||||
libcutils
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := \
|
||||
libaudiopolicycomponents
|
||||
|
||||
LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
|
||||
|
||||
LOCAL_MODULE := libaudiopolicyengineconfig
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
|
||||
LOCAL_HEADER_LIBRARIES := \
|
||||
libaudio_system_headers \
|
||||
libaudiopolicycommon
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
@ -0,0 +1,32 @@
|
||||
cc_library_shared {
|
||||
name: "libaudiopolicyenginedefault",
|
||||
export_include_dirs: ["include"],
|
||||
srcs: [
|
||||
"src/Engine.cpp",
|
||||
"src/EngineInstance.cpp",
|
||||
],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
"-Wextra",
|
||||
],
|
||||
local_include_dirs: ["include"],
|
||||
header_libs: [
|
||||
"libbase_headers",
|
||||
"libaudiopolicycommon",
|
||||
"libaudiopolicyengine_interface_headers",
|
||||
],
|
||||
static_libs: [
|
||||
"libaudiopolicycomponents",
|
||||
"libaudiopolicyengine_common",
|
||||
"libaudiopolicyengine_config",
|
||||
],
|
||||
shared_libs: [
|
||||
"liblog",
|
||||
"libcutils",
|
||||
"libutils",
|
||||
"libmedia_helper",
|
||||
"libaudiopolicy",
|
||||
"libxml2",
|
||||
],
|
||||
}
|
@ -1,57 +0,0 @@
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
# Component build
|
||||
#######################################################################
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
src/Engine.cpp \
|
||||
src/EngineInstance.cpp \
|
||||
../engine/common/src/VolumeCurve.cpp \
|
||||
../engine/common/src/ProductStrategy.cpp \
|
||||
../engine/common/src/EngineBase.cpp \
|
||||
../engine/common/src/VolumeGroup.cpp
|
||||
|
||||
audio_policy_engine_includes_common := \
|
||||
$(LOCAL_PATH)/include
|
||||
|
||||
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) \
|
||||
$(call include-path-for, bionic)
|
||||
|
||||
LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
|
||||
|
||||
LOCAL_MODULE := libaudiopolicyenginedefault
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
|
||||
LOCAL_HEADER_LIBRARIES := libbase_headers
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := \
|
||||
libaudiopolicycomponents
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
liblog \
|
||||
libcutils \
|
||||
libutils \
|
||||
libmedia_helper \
|
||||
libaudiopolicyengineconfig \
|
||||
libaudiopolicy
|
||||
|
||||
LOCAL_HEADER_LIBRARIES := \
|
||||
libaudiopolicycommon \
|
||||
libaudiopolicyengine_common_headers \
|
||||
libaudiopolicyengine_interface_headers
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
Loading…
Reference in new issue