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

Commit 73ea4299 authored by Andy Hung's avatar Andy Hung Committed by android-build-merger
Browse files

Merge "Update audio services for 64 bit compilation" into nyc-dev 

am: 560a198f

* commit '560a198f':
  Update audio services for 64 bit compilation
parents b363544c 560a198f

media/audioserver/Android.mk

+19 −1
Original line number Diff line number Diff line
@@ -31,8 +31,26 @@ LOCAL_C_INCLUDES := \ 
	$(call include-path-for, audio-utils) \

	external/sonic \



# If AUDIOSERVER_MULTILIB in device.mk is non-empty then it is used to control

# the LOCAL_MULTILIB for all audioserver exclusive libraries.

# This is relevant for 64 bit architectures where either or both

# 32 and 64 bit libraries may be built.

#

# AUDIOSERVER_MULTILIB may be set as follows:

#   32      to build 32 bit audioserver libraries and 32 bit audioserver.

#   64      to build 64 bit audioserver libraries and 64 bit audioserver.

#   both    to build both 32 bit and 64 bit libraries,

#           and use primary target architecture (32 or 64) for audioserver.

#   first   to build libraries and audioserver for the primary target architecture only.

#   <empty> to build both 32 and 64 bit libraries and 32 bit audioserver.



ifeq ($(strip $(AUDIOSERVER_MULTILIB)),)

LOCAL_MULTILIB := 32

else

LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)

endif



LOCAL_MODULE := audioserver

LOCAL_32_BIT_ONLY := true



LOCAL_INIT_RC := audioserver.rc

services/audioflinger/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -60,8 +60,9 @@ LOCAL_STATIC_LIBRARIES := \ 
    libcpustats \

    libmedia_helper



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)



LOCAL_MODULE:= libaudioflinger

LOCAL_32_BIT_ONLY := true



LOCAL_SRC_FILES += \

    AudioWatchdog.cpp        \

services/audiopolicy/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -45,13 +45,14 @@ LOCAL_STATIC_LIBRARIES := \ 
    libmedia_helper \

    libaudiopolicycomponents



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)



LOCAL_MODULE:= libaudiopolicyservice



LOCAL_CFLAGS += -fvisibility=hidden



include $(BUILD_SHARED_LIBRARY)





ifneq ($(USE_LEGACY_AUDIO_POLICY), 1)



include $(CLEAR_VARS)
@@ -101,6 +102,8 @@ LOCAL_SHARED_LIBRARIES += libicuuc 
LOCAL_CFLAGS += -DUSE_XML_AUDIO_POLICY_CONF

endif #ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)



LOCAL_MODULE:= libaudiopolicymanagerdefault



include $(BUILD_SHARED_LIBRARY)
@@ -122,6 +125,8 @@ LOCAL_C_INCLUDES += \ 
    $(TOPDIR)frameworks/av/services/audiopolicy/common/include \

    $(TOPDIR)frameworks/av/services/audiopolicy/engine/interface



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)



LOCAL_MODULE:= libaudiopolicymanager



include $(BUILD_SHARED_LIBRARY)

services/audiopolicy/common/managerdefinitions/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ endif #ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1) 
LOCAL_EXPORT_C_INCLUDE_DIRS := \

    $(LOCAL_PATH)/include



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)



LOCAL_MODULE := libaudiopolicycomponents



include $(BUILD_STATIC_LIBRARY)

services/audiopolicy/engineconfigurable/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ LOCAL_C_INCLUDES := \ 
    $(call include-path-for, audio-utils) \

    $(TOPDIR)frameworks/av/services/audiopolicy/common/include



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)



LOCAL_MODULE := libaudiopolicyengineconfigurable

LOCAL_MODULE_TAGS := optional