diff options
author | Dan Albert <danalbert@google.com> | 2014-08-08 17:02:58 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-07 18:51:06 +0000 |
commit | 5a192121e99a740dab6df2b6550e02ef18f5dbc7 (patch) | |
tree | 7ca915a5c3d45010cd1238ab6f3470572e54e2af /media/libstagefright/codecs/mp3dec | |
parent | 9ee1572f7f01797b7526de95cb322f90c9b626bd (diff) | |
parent | b1a164e1445bcc48498e2091f42c5275a01f5a84 (diff) | |
download | frameworks_av-5a192121e99a740dab6df2b6550e02ef18f5dbc7.zip frameworks_av-5a192121e99a740dab6df2b6550e02ef18f5dbc7.tar.gz frameworks_av-5a192121e99a740dab6df2b6550e02ef18f5dbc7.tar.bz2 |
Merge "Revert "Fix build after side-stepping global -Bsymbolic.""
Diffstat (limited to 'media/libstagefright/codecs/mp3dec')
-rw-r--r-- | media/libstagefright/codecs/mp3dec/Android.mk | 10 |
1 files changed, 0 insertions, 10 deletions
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 |