diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-08-29 11:10:32 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-08-30 10:53:37 -0700 |
| commit | 2dd4bdd715f586d4d30cf90cc6fc2bbfbce60fe0 (patch) | |
| tree | d0f594b402b6d2a4de89386c30c3db4adab89894 /services/audioflinger/Android.mk | |
| parent | 0a24726a64ba1c50aa6ee1610de2d80602d49fe6 (diff) | |
| download | frameworks_av-2dd4bdd715f586d4d30cf90cc6fc2bbfbce60fe0.zip frameworks_av-2dd4bdd715f586d4d30cf90cc6fc2bbfbce60fe0.tar.gz frameworks_av-2dd4bdd715f586d4d30cf90cc6fc2bbfbce60fe0.tar.bz2 | |
Move libnbaio out of AudioFlinger
libnbaio is now a separate shared library from AudioFlinger, rather
than a static library used only by AudioFlinger.
AudioBufferProvider interface is now also independent of AudioFlinger,
moved to include/media/
Change-Id: I9bb62ffbc38d42a38b0af76e66da5e9ab1e0e21b
Diffstat (limited to 'services/audioflinger/Android.mk')
| -rw-r--r-- | services/audioflinger/Android.mk | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index c2d2790..66759d1 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -13,32 +13,6 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_SRC_FILES := \ - AudioBufferProviderSource.cpp \ - AudioStreamOutSink.cpp \ - AudioStreamInSource.cpp \ - NBAIO.cpp \ - MonoPipe.cpp \ - MonoPipeReader.cpp \ - Pipe.cpp \ - PipeReader.cpp \ - roundup.c \ - SourceAudioBufferProvider.cpp - -# libsndfile license is incompatible; uncomment to use for local debug only -#LOCAL_SRC_FILES += LibsndfileSink.cpp LibsndfileSource.cpp -#LOCAL_C_INCLUDES += path/to/libsndfile/src -#LOCAL_STATIC_LIBRARIES += libsndfile - -# uncomment for systrace -# LOCAL_CFLAGS += -DATRACE_TAG=ATRACE_TAG_AUDIO - -LOCAL_MODULE := libnbaio - -include $(BUILD_STATIC_LIBRARY) - -include $(CLEAR_VARS) - LOCAL_SRC_FILES:= \ AudioFlinger.cpp \ AudioMixer.cpp.arm \ @@ -66,6 +40,7 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libmedia \ libmedia_native \ + libnbaio \ libhardware \ libhardware_legacy \ libeffects \ @@ -74,7 +49,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \ libscheduling_policy \ - libnbaio \ libcpustats \ libmedia_helper |