gugelfrei
/
android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audiopolicy: fix build issue by going on switching to bp

Browse Source 
Bug: 130284799
Test: make

Change-Id: I60d41eaa41564fecdeef6d4cb223a8367883db50
Signed-off-by: François Gaffie <francois.gaffie@renault.com>
gugelfrei
François Gaffie 5 years ago committed by Eric Laurent
parent 48601f013a
commit 962ba215fb
21 changed files with 261 additions and 328 deletions
Show Stats Download Patch File Download Diff File

5
services/audiopolicy/Android.bp
Unescape View File

@ -0,0 +1,5 @@
cc_library_headers {
name: "libaudiopolicymanager_interface_headers",
host_supported: true,
export_include_dirs: ["."],
}

136
services/audiopolicy/Android.mk
Unescape View File

@ -1,136 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
service/AudioPolicyService.cpp \
service/AudioPolicyEffects.cpp \
service/AudioPolicyInterfaceImpl.cpp \
service/AudioPolicyClientImpl.cpp
LOCAL_C_INCLUDES := \
frameworks/av/services/audioflinger \
$(call include-path-for, audio-utils) \
LOCAL_HEADER_LIBRARIES := \
libaudiopolicycommon \
libaudiopolicyengine_interface_headers \
LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils \
liblog \
libbinder \
libaudioclient \
libhardware_legacy \
libaudiopolicymanager \
libmedia_helper \
libmediametrics \
libmediautils \
libeffectsconfig \
libsensorprivacy
LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := \
libsensorprivacy
LOCAL_STATIC_LIBRARIES := \
libaudiopolicycomponents
LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
LOCAL_MODULE:= libaudiopolicyservice
LOCAL_CFLAGS += -fvisibility=hidden
LOCAL_CFLAGS += -Wall -Werror
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= managerdefault/AudioPolicyManager.cpp
LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils \
liblog \
libaudiopolicy \
libsoundtrigger
ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1)
ifneq ($(USE_XML_AUDIO_POLICY_CONF), 1)
$(error Configurable policy does not support legacy conf file)
endif #ifneq ($(USE_XML_AUDIO_POLICY_CONF), 1)
LOCAL_C_INCLUDES += frameworks/av/services/audiopolicy/engineconfigurable/include
LOCAL_C_INCLUDES += frameworks/av/include
LOCAL_SHARED_LIBRARIES += libaudiopolicyengineconfigurable
else
LOCAL_SHARED_LIBRARIES += libaudiopolicyenginedefault
endif # ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1)
LOCAL_C_INCLUDES += \
$(call include-path-for, audio-utils) \
LOCAL_HEADER_LIBRARIES := \
libaudiopolicycommon \
libaudiopolicyengine_interface_headers
LOCAL_STATIC_LIBRARIES := \
libaudiopolicycomponents
LOCAL_SHARED_LIBRARIES += libmedia_helper
LOCAL_SHARED_LIBRARIES += libmediametrics
LOCAL_SHARED_LIBRARIES += libbinder libhidlbase libxml2
ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)
LOCAL_CFLAGS += -DUSE_XML_AUDIO_POLICY_CONF
endif #ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)
LOCAL_CFLAGS += -Wall -Werror
LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
LOCAL_MODULE:= libaudiopolicymanagerdefault
include $(BUILD_SHARED_LIBRARY)
ifneq ($(USE_CUSTOM_AUDIO_POLICY), 1)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
manager/AudioPolicyFactory.cpp
LOCAL_SHARED_LIBRARIES := \
libaudiopolicymanagerdefault
LOCAL_STATIC_LIBRARIES := \
libaudiopolicycomponents
LOCAL_C_INCLUDES += \
$(call include-path-for, audio-utils) \
LOCAL_HEADER_LIBRARIES := \
libaudiopolicycommon \
libaudiopolicyengine_interface_headers
LOCAL_CFLAGS := -Wall -Werror
LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
LOCAL_MODULE:= libaudiopolicymanager
include $(BUILD_SHARED_LIBRARY)
endif
#######################################################################
# Recursive call sub-folder Android.mk
#
include $(call all-makefiles-under,$(LOCAL_PATH))

1
services/audiopolicy/common/managerdefinitions/Android.bp
Unescape View File

@ -34,6 +34,7 @@ cc_library_static {
],
header_libs: [
"libaudiopolicycommon",
"libaudiopolicymanager_interface_headers",
],
export_header_lib_headers: ["libaudiopolicycommon"],

9
services/audiopolicy/engine/Android.mk
Unescape View File

@ -1,9 +0,0 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
#######################################################################
# Recursive call sub-folder Android.mk
#
include $(call all-makefiles-under,$(LOCAL_PATH))

44
services/audiopolicy/engineconfigurable/Android.bp
Unescape View File

@ -0,0 +1,44 @@
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",
],
}

67
services/audiopolicy/engineconfigurable/Android.mk
Unescape View File

@ -1,67 +0,0 @@
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

9
services/audiopolicy/engineconfigurable/config/Android.mk
Unescape View File

@ -1,9 +0,0 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
#######################################################################
# Recursive call sub-folder Android.mk
#
include $(call all-makefiles-under,$(LOCAL_PATH))

4
services/audiopolicy/engineconfigurable/config/example/Android.mk
Unescape View File

@ -1,5 +1,7 @@
LOCAL_PATH := $(call my-dir)
ifdef BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION
TOOLS := frameworks/av/services/audiopolicy/engineconfigurable/tools
PROVISION_CRITERION_TYPES := $(TOOLS)/provision_criterion_types_from_android_headers.mk
@ -145,3 +147,5 @@ CRITERION_TYPES_FILE := $(LOCAL_PATH)/common/$(LOCAL_MODULE).in
include $(PROVISION_CRITERION_TYPES)
endif #ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),$(filter $(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),phone_configurable automotive_configurable caremu_configurable))
endif #ifdef BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION

7
services/audiopolicy/engineconfigurable/parameter-framework/Android.mk
Unescape View File

@ -1,7 +0,0 @@
LOCAL_PATH := $(call my-dir)
#######################################################################
# Recursive call sub-folder Android.mk
#######################################################################
include $(call all-makefiles-under,$(LOCAL_PATH))

15
services/audiopolicy/engineconfigurable/parameter-framework/examples/Android.mk
Unescape View File

@ -9,6 +9,8 @@
LOCAL_PATH := $(call my-dir)
ifdef BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION
ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),$(filter $(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),phone_configurable automotive_configurable caremu_configurable no-output_configurable no-input_configurable))
PFW_CORE := external/parameter-framework
@ -39,7 +41,7 @@ LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := parameter-framework
LOCAL_SRC_FILES := $(LOCAL_MODULE).in
LOCAL_REQUIRED_MODULES := \
PolicySubsystem.xml\
PolicySubsystem.xml \
PolicyClass.xml
# external/parameter-framework prevents from using debug interface
@ -106,26 +108,26 @@ endif #ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),$(filter $(BUILD_AUDIO_
ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),$(filter $(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),no-output_configurable no-input_configurable))
include $(CLEAR_VARS)
LOCAL_MODULE := PolicySubsystem-no-strategy.xml
LOCAL_MODULE_STEM := PolicySubsystem.xml
LOCAL_MODULE := PolicySubsystem.xml
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_VENDOR_MODULE := true
LOCAL_REQUIRED_MODULES := PolicySubsystem-CommonTypes.xml
LOCAL_MODULE_RELATIVE_PATH := parameter-framework/Structure/Policy
LOCAL_SRC_FILES := common/Structure/$(LOCAL_MODULE_STEM)
LOCAL_SRC_FILES := common/Structure/$(LOCAL_MODULE)
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := ParameterFrameworkConfigurationPolicy.xml
LOCAL_MODULE := ParameterFrameworkConfigurationPolicy-no-strategy.xml
LOCAL_MODULE_STEM := ParameterFrameworkConfigurationPolicy.xml
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := parameter-framework
LOCAL_SRC_FILES := $(LOCAL_MODULE).in
LOCAL_REQUIRED_MODULES := \
PolicySubsystem-no-strategy.xml\
PolicySubsystem.xml \
PolicyClass.xml
AUDIO_VALUE = false
LOCAL_POST_INSTALL_CMD := $(hide) sed -i -e 's|$(AUDIO_PATTERN)|$(AUDIO_VALUE)|g' $(TARGET_OUT_VENDOR_ETC)/$(LOCAL_MODULE_RELATIVE_PATH)/$(LOCAL_MODULE)
@ -181,4 +183,5 @@ endif #ifeq ($(BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION),no-input_configurable)
include $(call all-makefiles-under,$(LOCAL_PATH))
endif #ifdef BUILD_AUDIO_POLICY_EXAMPLE_CONFIGURATION

36
services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.bp
Unescape View File

@ -0,0 +1,36 @@
cc_library_shared {
name: "libpolicy-subsystem",
srcs: [
"PolicySubsystemBuilder.cpp",
"PolicySubsystem.cpp",
"InputSource.cpp",
"Stream.cpp",
"ProductStrategy.cpp",
],
cflags: [
"-Wall",
"-Werror",
"-Wextra",
"-fvisibility-inlines-hidden",
"-fvisibility=hidden",
],
header_libs: [
"libbase_headers",
"libaudiopolicycommon",
"libaudioclient_headers",
"libaudiopolicyengine_interface_headers",
"libaudiopolicyengineconfigurable_interface_headers",
],
static_libs: [
"libaudiopolicycomponents",
"libaudiopolicyengine_common",
"libpfw_utility",
],
shared_libs: [
"libaudiopolicyengineconfigurable",
"liblog",
"libutils",
"libmedia_helper",
"libparameter"
],
}

43
services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.mk
Unescape View File

@ -1,43 +0,0 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := \
PolicySubsystemBuilder.cpp \
PolicySubsystem.cpp \
InputSource.cpp \
Stream.cpp \
ProductStrategy.cpp
LOCAL_CFLAGS += \
-Wall \
-Werror \
-Wextra \
-fvisibility-inlines-hidden \
-fvisibility=hidden
LOCAL_C_INCLUDES := \
frameworks/av/services/audiopolicy/engineconfigurable/include \
frameworks/av/services/audiopolicy/engineconfigurable/interface
LOCAL_SHARED_LIBRARIES := \
libaudiopolicyengineconfigurable \
libparameter \
libmedia_helper \
liblog \
LOCAL_HEADER_LIBRARIES := \
libaudiopolicycommon \
libaudioclient_headers \
libbase_headers
LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
LOCAL_STATIC_LIBRARIES := \
libpfw_utility \
libaudiopolicycomponents
LOCAL_MODULE := libpolicy-subsystem
include $(BUILD_SHARED_LIBRARY)

21
services/audiopolicy/engineconfigurable/wrapper/Android.bp
Unescape View File

@ -0,0 +1,21 @@
cc_library {
name: "libaudiopolicyengineconfigurable_pfwwrapper",
export_include_dirs: ["include"],
srcs: ["ParameterManagerWrapper.cpp"],
cflags: [
"-Wall",
"-Werror",
"-Wextra",
],
header_libs: [
"libbase_headers",
"libaudiopolicycommon",
],
static_libs: ["libaudiopolicycomponents"],
shared_libs: [
"liblog",
"libutils",
"libmedia_helper",
"libparameter",
],
}

39
services/audiopolicy/engineconfigurable/wrapper/Android.mk
Unescape View File

@ -1,39 +0,0 @@
LOCAL_PATH:= $(call my-dir)
##################################################################
# WRAPPER LIBRARY
##################################################################
include $(CLEAR_VARS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include \
frameworks/av/services/audiopolicy/engineconfigurable/include \
frameworks/av/services/audiopolicy/engineconfigurable/interface \
external/libxml2/include \
external/icu/icu4c/source/common
LOCAL_SRC_FILES:= \
ParameterManagerWrapper.cpp
LOCAL_SHARED_LIBRARIES := \
libparameter \
libmedia_helper \
libxml2
LOCAL_HEADER_LIBRARIES := \
libaudiopolicycommon
LOCAL_STATIC_LIBRARIES := \
libaudiopolicycomponents
LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
LOCAL_MODULE:= libaudiopolicypfwwrapper
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := -Wall -Werror -Wextra
include $(BUILD_STATIC_LIBRARY)

9
services/audiopolicy/enginedefault/config/Android.mk
Unescape View File

@ -1,9 +0,0 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
#######################################################################
# Recursive call sub-folder Android.mk
#
include $(call all-makefiles-under,$(LOCAL_PATH))

32
services/audiopolicy/manager/Android.mk
Unescape View File

@ -0,0 +1,32 @@
LOCAL_PATH:= $(call my-dir)
ifneq ($(USE_CUSTOM_AUDIO_POLICY), 1)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
AudioPolicyFactory.cpp
LOCAL_SHARED_LIBRARIES := \
libaudiopolicymanagerdefault
LOCAL_STATIC_LIBRARIES := \
libaudiopolicycomponents
LOCAL_C_INCLUDES += \
$(call include-path-for, audio-utils)
LOCAL_HEADER_LIBRARIES := \
libaudiopolicycommon \
libaudiopolicyengine_interface_headers \
libaudiopolicymanager_interface_headers
LOCAL_CFLAGS := -Wall -Werror
LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
LOCAL_MODULE:= libaudiopolicymanager
include $(BUILD_SHARED_LIBRARY)
endif #ifneq ($(USE_CUSTOM_AUDIO_POLICY), 1)

2
services/audiopolicy/manager/AudioPolicyFactory.cpp
Unescape View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "managerdefault/AudioPolicyManager.h"
#include <AudioPolicyManager.h>
namespace android {

56
services/audiopolicy/managerdefault/Android.mk
Unescape View File

@ -0,0 +1,56 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= AudioPolicyManager.cpp
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils \
liblog \
libaudiopolicy \
libsoundtrigger
ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1)
ifneq ($(USE_XML_AUDIO_POLICY_CONF), 1)
$(error Configurable policy does not support legacy conf file)
endif #ifneq ($(USE_XML_AUDIO_POLICY_CONF), 1)
LOCAL_SHARED_LIBRARIES += libaudiopolicyengineconfigurable
else
LOCAL_SHARED_LIBRARIES += libaudiopolicyenginedefault
endif # ifeq ($(USE_CONFIGURABLE_AUDIO_POLICY), 1)
LOCAL_C_INCLUDES += \
$(call include-path-for, audio-utils)
LOCAL_HEADER_LIBRARIES := \
libaudiopolicycommon \
libaudiopolicyengine_interface_headers \
libaudiopolicymanager_interface_headers
LOCAL_STATIC_LIBRARIES := \
libaudiopolicycomponents
LOCAL_SHARED_LIBRARIES += libmedia_helper
LOCAL_SHARED_LIBRARIES += libmediametrics
LOCAL_SHARED_LIBRARIES += libbinder libhidlbase libxml2
ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)
LOCAL_CFLAGS += -DUSE_XML_AUDIO_POLICY_CONF
endif #ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)
LOCAL_CFLAGS += -Wall -Werror
LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
LOCAL_MODULE:= libaudiopolicymanagerdefault
include $(BUILD_SHARED_LIBRARY)

49
services/audiopolicy/service/Android.mk
Unescape View File

@ -0,0 +1,49 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
AudioPolicyService.cpp \
AudioPolicyEffects.cpp \
AudioPolicyInterfaceImpl.cpp \
AudioPolicyClientImpl.cpp
LOCAL_C_INCLUDES := \
frameworks/av/services/audioflinger \
$(call include-path-for, audio-utils)
LOCAL_HEADER_LIBRARIES := \
libaudiopolicycommon \
libaudiopolicyengine_interface_headers \
libaudiopolicymanager_interface_headers
LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils \
liblog \
libbinder \
libaudioclient \
libaudioutils \
libhardware_legacy \
libaudiopolicymanager \
libmedia_helper \
libmediametrics \
libmediautils \
libeffectsconfig \
libsensorprivacy
LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := \
libsensorprivacy
LOCAL_STATIC_LIBRARIES := \
libaudiopolicycomponents
LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
LOCAL_MODULE:= libaudiopolicyservice
LOCAL_CFLAGS += -fvisibility=hidden
LOCAL_CFLAGS += -Wall -Werror
include $(BUILD_SHARED_LIBRARY)

2
services/audiopolicy/service/AudioPolicyService.h
Unescape View File

@ -33,7 +33,7 @@
#include <media/AudioPolicy.h>
#include <mediautils/ServiceUtilities.h>
#include "AudioPolicyEffects.h"
#include "managerdefault/AudioPolicyManager.h"
#include <AudioPolicyInterface.h>
#include <android/hardware/BnSensorPrivacyListener.h>
#include <unordered_map>

3
services/audiopolicy/tests/Android.mk
Unescape View File

@ -18,7 +18,8 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_HEADER_LIBRARIES := \
libaudiopolicycommon \
libaudiopolicyengine_interface_headers
libaudiopolicyengine_interface_headers \
libaudiopolicymanager_interface_headers
LOCAL_SRC_FILES := \
audiopolicymanager_tests.cpp \

Write Preview
Loading…
Cancel
Save