diff options
| author | Dan Albert <danalbert@google.com> | 2014-08-08 17:07:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-08 17:07:02 +0000 |
| commit | aed1d5813fbf5c5a820dc462b7352474f1153068 (patch) | |
| tree | 78676aeb0b6490397642a351e4d07bca8c2fc12d /media/libstagefright | |
| parent | 4b59953778bb49d0b316ad8f83991d5f6fb02fba (diff) | |
| parent | 5a192121e99a740dab6df2b6550e02ef18f5dbc7 (diff) | |
| download | frameworks_av-aed1d5813fbf5c5a820dc462b7352474f1153068.zip frameworks_av-aed1d5813fbf5c5a820dc462b7352474f1153068.tar.gz frameworks_av-aed1d5813fbf5c5a820dc462b7352474f1153068.tar.bz2 | |
am 5a192121: Merge "Revert "Fix build after side-stepping global -Bsymbolic.""
* commit '5a192121e99a740dab6df2b6550e02ef18f5dbc7':
Revert "Fix build after side-stepping global -Bsymbolic."
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/codecs/amrwbenc/Android.mk | 10 | ||||
| -rw-r--r-- | media/libstagefright/codecs/mp3dec/Android.mk | 10 | ||||
| -rw-r--r-- | media/libstagefright/codecs/on2/h264dec/Android.mk | 5 |
3 files changed, 0 insertions, 25 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/Android.mk b/media/libstagefright/codecs/amrwbenc/Android.mk index a39c55b..c5b8e0c 100644 --- a/media/libstagefright/codecs/amrwbenc/Android.mk +++ b/media/libstagefright/codecs/amrwbenc/Android.mk @@ -94,11 +94,6 @@ LOCAL_STATIC_LIBRARIES := LOCAL_SHARED_LIBRARIES := -# We need this because the current asm generates the following link error: -# requires unsupported dynamic reloc R_ARM_REL32; recompile with -fPIC -# Bug: 16853291 -LOCAL_LDFLAGS := -Wl,-Bsymbolic - LOCAL_C_INCLUDES := \ frameworks/av/include \ frameworks/av/media/libstagefright/include \ @@ -138,11 +133,6 @@ LOCAL_SHARED_LIBRARIES := \ libstagefright_omx libstagefright_foundation libutils liblog \ libstagefright_enc_common -# We need this because the current asm generates the following link error: -# requires unsupported dynamic reloc R_ARM_REL32; recompile with -fPIC -# Bug: 16853291 -LOCAL_LDFLAGS := -Wl,-Bsymbolic - LOCAL_MODULE := libstagefright_soft_amrwbenc LOCAL_MODULE_TAGS := optional diff --git a/media/libstagefright/codecs/mp3dec/Android.mk b/media/libstagefright/codecs/mp3dec/Android.mk index dd8c28b..135c715 100644 --- a/media/libstagefright/codecs/mp3dec/Android.mk +++ b/media/libstagefright/codecs/mp3dec/Android.mk @@ -50,11 +50,6 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := \ -DOSCL_UNUSED_ARG= -# We need this because the current asm generates the following link error: -# requires unsupported dynamic reloc R_ARM_REL32; recompile with -fPIC -# Bug: 16853291 -LOCAL_LDFLAGS := -Wl,-Bsymbolic - LOCAL_MODULE := libstagefright_mp3dec LOCAL_ARM_MODE := arm @@ -80,11 +75,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \ libstagefright_mp3dec -# We need this because the current asm generates the following link error: -# requires unsupported dynamic reloc R_ARM_REL32; recompile with -fPIC -# Bug: 16853291 -LOCAL_LDFLAGS := -Wl,-Bsymbolic - LOCAL_MODULE := libstagefright_soft_mp3dec LOCAL_MODULE_TAGS := optional diff --git a/media/libstagefright/codecs/on2/h264dec/Android.mk b/media/libstagefright/codecs/on2/h264dec/Android.mk index 7291c22..bf03ad9 100644 --- a/media/libstagefright/codecs/on2/h264dec/Android.mk +++ b/media/libstagefright/codecs/on2/h264dec/Android.mk @@ -100,11 +100,6 @@ endif LOCAL_SHARED_LIBRARIES := \ libstagefright libstagefright_omx libstagefright_foundation libutils liblog \ -# We need this because the current asm generates the following link error: -# requires unsupported dynamic reloc R_ARM_REL32; recompile with -fPIC -# Bug: 16853291 -LOCAL_LDFLAGS := -Wl,-Bsymbolic - LOCAL_MODULE := libstagefright_soft_h264dec LOCAL_MODULE_TAGS := optional |