diff options
| author | Ying Wang <wangying@google.com> | 2014-05-08 08:55:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 08:55:36 +0000 |
| commit | cf79c7a576837d8bccecc80612a1f6f30bb328a8 (patch) | |
| tree | 1fb19ac1715580d5b479fe398296758d717101d9 | |
| parent | 711719885d7563068579abf347c366cf6bc906f5 (diff) | |
| parent | 02483465e294571a6a92fce4f38c933e77bf5e67 (diff) | |
| download | frameworks_av-cf79c7a576837d8bccecc80612a1f6f30bb328a8.zip frameworks_av-cf79c7a576837d8bccecc80612a1f6f30bb328a8.tar.gz frameworks_av-cf79c7a576837d8bccecc80612a1f6f30bb328a8.tar.bz2 | |
am 02483465: am 1d2909b3: Merge "Remove unused LOCAL_LDLIBS."
* commit '02483465e294571a6a92fce4f38c933e77bf5e67':
Remove unused LOCAL_LDLIBS.
| -rwxr-xr-x | libvideoeditor/lvpp/Android.mk | 4 | ||||
| -rwxr-xr-x | libvideoeditor/osal/src/Android.mk | 4 | ||||
| -rwxr-xr-x | libvideoeditor/vss/3gpwriter/src/Android.mk | 5 | ||||
| -rwxr-xr-x | libvideoeditor/vss/mcs/src/Android.mk | 5 | ||||
| -rwxr-xr-x | libvideoeditor/vss/src/Android.mk | 4 | ||||
| -rwxr-xr-x | libvideoeditor/vss/video_filters/src/Android.mk | 5 |
6 files changed, 0 insertions, 27 deletions
diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk index 06c2e6a..a84ddad 100755 --- a/libvideoeditor/lvpp/Android.mk +++ b/libvideoeditor/lvpp/Android.mk @@ -85,10 +85,6 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES += libdl -# All of the shared libraries we link against. -LOCAL_LDLIBS := \ - -lpthread -ldl - LOCAL_CFLAGS += -Wno-multichar \ -DM4_ENABLE_RENDERINGMODE \ -DUSE_STAGEFRIGHT_CODECS \ diff --git a/libvideoeditor/osal/src/Android.mk b/libvideoeditor/osal/src/Android.mk index 4f38b0c..b613387 100755 --- a/libvideoeditor/osal/src/Android.mk +++ b/libvideoeditor/osal/src/Android.mk @@ -48,10 +48,6 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES += libdl -# All of the shared libraries we link against. -LOCAL_LDLIBS := \ - -lpthread -ldl - LOCAL_CFLAGS += -Wno-multichar \ -D__ANDROID__ \ -DM4OSA_FILE_BLOCK_WITH_SEMAPHORE \ diff --git a/libvideoeditor/vss/3gpwriter/src/Android.mk b/libvideoeditor/vss/3gpwriter/src/Android.mk index 8ab32ba..b70300f 100755 --- a/libvideoeditor/vss/3gpwriter/src/Android.mk +++ b/libvideoeditor/vss/3gpwriter/src/Android.mk @@ -43,12 +43,7 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES += libdl -# All of the shared libraries we link against. -LOCAL_LDLIBS := \ - -lpthread -ldl - LOCAL_CFLAGS += -Wno-multichar \ -DDUPLICATE_STTS_IN_LAST_AU include $(BUILD_STATIC_LIBRARY) - diff --git a/libvideoeditor/vss/mcs/src/Android.mk b/libvideoeditor/vss/mcs/src/Android.mk index b470e6b..330aa61 100755 --- a/libvideoeditor/vss/mcs/src/Android.mk +++ b/libvideoeditor/vss/mcs/src/Android.mk @@ -47,12 +47,7 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES += libdl -# All of the shared libraries we link against. -LOCAL_LDLIBS := \ - -lpthread -ldl - LOCAL_CFLAGS += -Wno-multichar \ -DM4MCS_WITH_FAST_OPEN include $(BUILD_STATIC_LIBRARY) - diff --git a/libvideoeditor/vss/src/Android.mk b/libvideoeditor/vss/src/Android.mk index 47627ec..0a3d64e 100755 --- a/libvideoeditor/vss/src/Android.mk +++ b/libvideoeditor/vss/src/Android.mk @@ -87,10 +87,6 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES += libdl -# All of the shared libraries we link against. -LOCAL_LDLIBS := \ - -lpthread -ldl - LOCAL_CFLAGS += -Wno-multichar \ -DM4xVSS_RESERVED_MOOV_DISK_SPACEno \ -DDECODE_GIF_ON_SAVING diff --git a/libvideoeditor/vss/video_filters/src/Android.mk b/libvideoeditor/vss/video_filters/src/Android.mk index 85a530c..88fa974 100755 --- a/libvideoeditor/vss/video_filters/src/Android.mk +++ b/libvideoeditor/vss/video_filters/src/Android.mk @@ -47,11 +47,6 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES += libdl -# All of the shared libraries we link against. -LOCAL_LDLIBS := \ - -lpthread -ldl - LOCAL_CFLAGS += -Wno-multichar include $(BUILD_SHARED_LIBRARY) - |