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

Commit 00c50ac8 authored by Sasha Smundak's avatar Sasha Smundak
Browse files

Do not assign LOCAL_MULTILIB to AUDIOSERVER_MULTILIB 

Bug: 121208203
Test: treehugger
Change-Id: I263b6b302f7220e4b712924d2df2fd2548af03b1
parent 39260a69

media/audioserver/Android.mk

+0 −15
Original line number Diff line number Diff line
@@ -40,21 +40,6 @@ LOCAL_C_INCLUDES := \ 
	frameworks/av/media/libmedia \

	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 primary target audioserver.



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)



LOCAL_MODULE := audioserver



LOCAL_INIT_RC := audioserver.rc

services/audiopolicy/manager/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ LOCAL_HEADER_LIBRARIES := \ 


LOCAL_CFLAGS := -Wall -Werror



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)



LOCAL_MODULE:= libaudiopolicymanager



include $(BUILD_SHARED_LIBRARY)

services/audiopolicy/service/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := \ 
LOCAL_STATIC_LIBRARIES := \

    libaudiopolicycomponents



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)



LOCAL_MODULE:= libaudiopolicyservice



LOCAL_CFLAGS += -fvisibility=hidden