diff options
| author | Dan Albert <danalbert@google.com> | 2014-08-07 23:22:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-07 17:53:11 +0000 |
| commit | 07574544bda57f4227c7eadf5682f7bf86e42b26 (patch) | |
| tree | 206ee7a090ec5d3e0c5e7e97171b264730091812 | |
| parent | a018cd4926460f8f5ab30a9a11df9775572d8620 (diff) | |
| parent | 3b909164de79904137bb6661514d5ca6236a49c9 (diff) | |
| download | frameworks_av-07574544bda57f4227c7eadf5682f7bf86e42b26.zip frameworks_av-07574544bda57f4227c7eadf5682f7bf86e42b26.tar.gz frameworks_av-07574544bda57f4227c7eadf5682f7bf86e42b26.tar.bz2 | |
Merge "Fix build after side-stepping global -Bsymbolic."
| -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, 25 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/Android.mk b/media/libstagefright/codecs/amrwbenc/Android.mk index c5b8e0c..a39c55b 100644 --- a/media/libstagefright/codecs/amrwbenc/Android.mk +++ b/media/libstagefright/codecs/amrwbenc/Android.mk @@ -94,6 +94,11 @@ 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 \ @@ -133,6 +138,11 @@ 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 135c715..dd8c28b 100644 --- a/media/libstagefright/codecs/mp3dec/Android.mk +++ b/media/libstagefright/codecs/mp3dec/Android.mk @@ -50,6 +50,11 @@ 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 @@ -75,6 +80,11 @@ 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 bf03ad9..7291c22 100644 --- a/media/libstagefright/codecs/on2/h264dec/Android.mk +++ b/media/libstagefright/codecs/on2/h264dec/Android.mk @@ -100,6 +100,11 @@ 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 |