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

Commit cda1e223 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Dan Willemsen
Browse files

audioserver: Remove direct dependency on IAudioRecord.aidl 

audioserver should not link directly the code generated from
IAudioRecord.aidl because it also gets it as a result of
depending on libmedia.so and other libraries.

Linking IAudioRecord.o directly causes violation of ODR
because it contains global data.

Bug: 117507477
Test: make
Change-Id: If165768e9097d1c95980883f1fe6e1aacae97506
Merged-In: If165768e9097d1c95980883f1fe6e1aacae97506
parent 1224227e

media/audioserver/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ include $(CLEAR_VARS) 


LOCAL_SRC_FILES := \

	main_audioserver.cpp \

	../libaudioclient/aidl/android/media/IAudioRecord.aidl



LOCAL_SHARED_LIBRARIES := \

	libaaudioservice \
@@ -39,9 +38,6 @@ LOCAL_C_INCLUDES := \ 
	$(call include-path-for, audio-utils) \

	external/sonic \



LOCAL_AIDL_INCLUDES := \

        frameworks/av/media/libaudioclient/aidl



# 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