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

Commit f40c4c56 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android Git Automerger
Browse files

am 36817364: Merge "Add libaudioresampler" 

* commit '36817364':
  Add libaudioresampler
parents 129c7653 36817364

services/audioflinger/Android.mk

+18 −11
Original line number Original line Diff line number Diff line
@@ -19,11 +19,8 @@ LOCAL_SRC_FILES:= \ 
    Tracks.cpp                  \

    Tracks.cpp                  \

    Effects.cpp                 \

    Effects.cpp                 \

    AudioMixer.cpp.arm          \

    AudioMixer.cpp.arm          \

    AudioResampler.cpp.arm      \

    AudioPolicyService.cpp      \

    AudioPolicyService.cpp      \

    ServiceUtilities.cpp        \

    ServiceUtilities.cpp        \

    AudioResamplerCubic.cpp.arm \

    AudioResamplerSinc.cpp.arm





LOCAL_SRC_FILES += StateQueue.cpp

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

    $(call include-path-for, audio-utils)





LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \

    libaudioresampler \

    libaudioutils \

    libaudioutils \

    libcommon_time_client \

    libcommon_time_client \

    libcutils \

    libcutils \
@@ -43,7 +41,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    libhardware \

    libhardware \

    libhardware_legacy \

    libhardware_legacy \

    libeffects \

    libeffects \

    libdl \

    libpowermanager

    libpowermanager





LOCAL_STATIC_LIBRARIES := \

LOCAL_STATIC_LIBRARIES := \
@@ -76,20 +73,30 @@ include $(CLEAR_VARS) 




LOCAL_SRC_FILES:=               \

LOCAL_SRC_FILES:=               \

	test-resample.cpp 			\

	test-resample.cpp 			\



LOCAL_SHARED_LIBRARIES := \

    libaudioresampler \



LOCAL_MODULE:= test-resample



LOCAL_MODULE_TAGS := optional



include $(BUILD_EXECUTABLE)



include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

    AudioResampler.cpp.arm \

    AudioResampler.cpp.arm \

    AudioResamplerCubic.cpp.arm \

    AudioResamplerCubic.cpp.arm \

    AudioResamplerSinc.cpp.arm

    AudioResamplerSinc.cpp.arm





LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \

    libdl \

    libcutils \

    libcutils \

    libutils \

    libdl \

    liblog

    liblog





LOCAL_MODULE:= test-resample

LOCAL_MODULE := libaudioresampler



LOCAL_MODULE_TAGS := optional





include $(BUILD_EXECUTABLE)

include $(BUILD_SHARED_LIBRARY)





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