diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-19 13:21:51 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-03-19 13:23:17 -0700 |
| commit | 46d1b4ab7e83c677532587c7c8bd46eb8b30fc67 (patch) | |
| tree | 0238e0ff00c67b6dfbcf38b4b50c400bd67b0b39 /services/audioflinger/Android.mk | |
| parent | d74110cdef2becd4f7fd2334c34c3ca73f56b355 (diff) | |
| parent | f40c4c561151ae93595e8fab5dcaaa1c69df74ef (diff) | |
| download | frameworks_av-46d1b4ab7e83c677532587c7c8bd46eb8b30fc67.zip frameworks_av-46d1b4ab7e83c677532587c7c8bd46eb8b30fc67.tar.gz frameworks_av-46d1b4ab7e83c677532587c7c8bd46eb8b30fc67.tar.bz2 | |
resolved conflicts for merge of f40c4c56 to master
Change-Id: Ifd5385ad42a81e02e6a6afc6281f09fbff361671
Diffstat (limited to 'services/audioflinger/Android.mk')
| -rw-r--r-- | services/audioflinger/Android.mk | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index de7e3c3..6cb0299 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -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)) |