diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-10-15 09:24:38 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-02-18 11:49:18 -0800 |
| commit | 3e8027a04c20a4b7028f1615538b36219386c9e5 (patch) | |
| tree | 547552b1b32c40961d9130d10b28b05b173b1782 /media | |
| parent | c02c96161dde9d6ca7b408cf08fcf10bd8e61a54 (diff) | |
| download | frameworks_av-3e8027a04c20a4b7028f1615538b36219386c9e5.zip frameworks_av-3e8027a04c20a4b7028f1615538b36219386c9e5.tar.gz frameworks_av-3e8027a04c20a4b7028f1615538b36219386c9e5.tar.bz2 | |
Move StateQueueInstantiations to libinstantssq
This removes a circular dependency between libmedia and libnbaio
Change-Id: I3692cbbe2b76028a953b36606b62cdda70c8c26f
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/Android.mk | 22 | ||||
| -rw-r--r-- | media/libnbaio/Android.mk | 7 |
2 files changed, 19 insertions, 10 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index fc4b2a5..26d94b0 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -60,16 +60,13 @@ LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES += ../libnbaio/roundup.c -# for <cutils/atomic-inline.h> -LOCAL_CFLAGS += -DANDROID_SMP=$(if $(findstring true,$(TARGET_CPU_SMP)),1,0) -LOCAL_SRC_FILES += SingleStateQueue.cpp -LOCAL_CFLAGS += -DSINGLE_STATE_QUEUE_INSTANTIATIONS='"SingleStateQueueInstantiations.cpp"' -# Consider a separate a library for SingleStateQueueInstantiations. - LOCAL_SHARED_LIBRARIES := \ libui liblog libcutils libutils libbinder libsonivox libicuuc libicui18n libexpat \ libcamera_client libstagefright_foundation \ libgui libdl libaudioutils +LOCAL_SHARED_LIBRARIES += libnbaio + +LOCAL_STATIC_LIBRARIES += libinstantssq LOCAL_WHOLE_STATIC_LIBRARY := libmedia_helper @@ -84,3 +81,16 @@ LOCAL_C_INCLUDES := \ $(call include-path-for, audio-utils) include $(BUILD_SHARED_LIBRARY) + +include $(CLEAR_VARS) + +# for <cutils/atomic-inline.h> +LOCAL_CFLAGS += -DANDROID_SMP=$(if $(findstring true,$(TARGET_CPU_SMP)),1,0) +LOCAL_SRC_FILES += SingleStateQueue.cpp +LOCAL_CFLAGS += -DSINGLE_STATE_QUEUE_INSTANTIATIONS='"SingleStateQueueInstantiations.cpp"' +# Consider a separate a library for SingleStateQueueInstantiations. + +LOCAL_MODULE := libinstantssq +LOCAL_MODULE_TAGS := optional + +include $(BUILD_STATIC_LIBRARY) diff --git a/media/libnbaio/Android.mk b/media/libnbaio/Android.mk index 69c75b8..9707c4a 100644 --- a/media/libnbaio/Android.mk +++ b/media/libnbaio/Android.mk @@ -31,9 +31,8 @@ LOCAL_SHARED_LIBRARIES := \ libcommon_time_client \ libcutils \ libutils \ - liblog \ - libmedia -# This dependency on libmedia is for SingleStateQueueInstantiations. -# Consider a separate a library for SingleStateQueueInstantiations. + liblog + +LOCAL_STATIC_LIBRARIES += libinstantssq include $(BUILD_SHARED_LIBRARY) |