diff options
| author | Andy Hung <hunga@google.com> | 2014-12-22 18:47:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-22 18:47:51 +0000 |
| commit | 84d8cf472c6f5b80f62c4eff8de0589b4b2fee74 (patch) | |
| tree | 7157eae8f4a44277866be448432fa53399fb3f1e /media/libmedia/Android.mk | |
| parent | 4f82a25c07c3ffc8d44d61797043f9864058afdf (diff) | |
| parent | 9b82924cbd203f1678c2f78aa73b15909efa3e81 (diff) | |
| download | frameworks_av-84d8cf472c6f5b80f62c4eff8de0589b4b2fee74.zip frameworks_av-84d8cf472c6f5b80f62c4eff8de0589b4b2fee74.tar.gz frameworks_av-84d8cf472c6f5b80f62c4eff8de0589b4b2fee74.tar.bz2 | |
Merge "Remove explicit instantiation of SingleStateQueue"
Diffstat (limited to 'media/libmedia/Android.mk')
| -rw-r--r-- | media/libmedia/Android.mk | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index c58a503..dc82102 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -70,8 +70,6 @@ LOCAL_SHARED_LIBRARIES := \ libcamera_client libstagefright_foundation \ libgui libdl libaudioutils libnbaio -LOCAL_STATIC_LIBRARIES += libinstantssq - LOCAL_WHOLE_STATIC_LIBRARIES := libmedia_helper LOCAL_MODULE:= libmedia @@ -89,12 +87,3 @@ LOCAL_C_INCLUDES := \ include $(BUILD_SHARED_LIBRARY) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES += SingleStateQueue.cpp -LOCAL_CFLAGS += -DSINGLE_STATE_QUEUE_INSTANTIATIONS='"SingleStateQueueInstantiations.cpp"' - -LOCAL_MODULE := libinstantssq -LOCAL_MODULE_TAGS := optional - -include $(BUILD_STATIC_LIBRARY) |