diff options
author | Dan Albert <danalbert@google.com> | 2014-08-07 17:20:42 -0700 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2014-08-07 17:20:42 -0700 |
commit | ec8b67eb9fc678d1e33c424cb4a468082fd0b1b2 (patch) | |
tree | dbf6f77e74626ab935dbcc8a8f948a0d04d19620 /media/libstagefright | |
parent | 9fdc1f14ad1e3c5bf2e58ace056e85d11fca76b4 (diff) | |
parent | 2af8711d3e3df7c7a4531bd25adc882c306cc97a (diff) | |
download | frameworks_av-ec8b67eb9fc678d1e33c424cb4a468082fd0b1b2.zip frameworks_av-ec8b67eb9fc678d1e33c424cb4a468082fd0b1b2.tar.gz frameworks_av-ec8b67eb9fc678d1e33c424cb4a468082fd0b1b2.tar.bz2 |
Resolved conflicts for merge of 2af8711d to lmp-dev-plus-aosp
Change-Id: I016dbca0318998f17fc741f873589c414774e7ff
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, 25 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/Android.mk b/media/libstagefright/codecs/amrwbenc/Android.mk index 64fe8d1..c85b964 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 \ @@ -137,6 +142,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 8284490..81ef9fe 100644 --- a/media/libstagefright/codecs/mp3dec/Android.mk +++ b/media/libstagefright/codecs/mp3dec/Android.mk @@ -52,6 +52,11 @@ LOCAL_CFLAGS := \ LOCAL_CFLAGS += -Werror +# 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 @@ -79,6 +84,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 |