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

Commit 46d1b4ab authored by Glenn Kasten's avatar Glenn Kasten
Browse files

resolved conflicts for merge of f40c4c56 to master 

Change-Id: Ifd5385ad42a81e02e6a6afc6281f09fbff361671
parents d74110cd f40c4c56

services/audioflinger/Android.mk

+19 −9
Original line number Diff line number Diff line
@@ -29,10 +29,6 @@ LOCAL_SRC_FILES:= \ 
    Tracks.cpp                  \

    Effects.cpp                 \

    AudioMixer.cpp.arm          \

    AudioResampler.cpp.arm      \

    AudioResamplerCubic.cpp.arm \

    AudioResamplerSinc.cpp.arm  \

    AudioResamplerDyn.cpp.arm



LOCAL_SRC_FILES += StateQueue.cpp
@@ -42,6 +38,7 @@ LOCAL_C_INCLUDES := \ 
    $(call include-path-for, audio-utils)



LOCAL_SHARED_LIBRARIES := \

    libaudioresampler \

    libaudioutils \

    libcommon_time_client \

    libcutils \
@@ -53,7 +50,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    libhardware \

    libhardware_legacy \

    libeffects \

    libdl \

    libpowermanager



LOCAL_STATIC_LIBRARIES := \
@@ -87,10 +83,6 @@ include $(CLEAR_VARS) 


LOCAL_SRC_FILES:=               \

    test-resample.cpp           \

    AudioResampler.cpp.arm      \

    AudioResamplerCubic.cpp.arm \

    AudioResamplerSinc.cpp.arm  \

    AudioResamplerDyn.cpp.arm



LOCAL_C_INCLUDES := \

    $(call include-path-for, audio-utils)
@@ -99,6 +91,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    libsndfile



LOCAL_SHARED_LIBRARIES := \

    libaudioresampler \

    libaudioutils \

    libdl \

    libcutils \
@@ -111,4 +104,21 @@ LOCAL_MODULE_TAGS := optional 


include $(BUILD_EXECUTABLE)



include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

    AudioResampler.cpp.arm \

    AudioResamplerCubic.cpp.arm \

    AudioResamplerSinc.cpp.arm \

    AudioResamplerDyn.cpp.arm



LOCAL_SHARED_LIBRARIES := \

    libcutils \

    libdl \

    liblog



LOCAL_MODULE := libaudioresampler



include $(BUILD_SHARED_LIBRARY)



include $(call all-makefiles-under,$(LOCAL_PATH))