diff options
| author | Dan Albert <danalbert@google.com> | 2014-08-08 07:37:59 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-08-08 07:45:39 -0700 |
| commit | b1a164e1445bcc48498e2091f42c5275a01f5a84 (patch) | |
| tree | 5c70e95c449781b60c311481a0b3fd58cd63ca37 /media | |
| parent | 07574544bda57f4227c7eadf5682f7bf86e42b26 (diff) | |
| download | frameworks_av-b1a164e1445bcc48498e2091f42c5275a01f5a84.zip frameworks_av-b1a164e1445bcc48498e2091f42c5275a01f5a84.tar.gz frameworks_av-b1a164e1445bcc48498e2091f42c5275a01f5a84.tar.bz2 | |
Revert "Fix build after side-stepping global -Bsymbolic."
This reverts commit 3b909164de79904137bb6661514d5ca6236a49c9.
Bug: 16853291
Diffstat (limited to 'media')
| -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 |