diff options
| author | Dan Albert <danalbert@google.com> | 2014-08-08 10:23:22 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-08-08 10:25:07 -0700 |
| commit | 62cb76f1a38475f0223660d5a9776d5e413b4160 (patch) | |
| tree | 29ac2bd09282ffb6f963b1e10bdaa3177e566206 /media/libstagefright | |
| parent | 38c5faaaf0ead823eeb1ccfc58888cfc2ceec7ac (diff) | |
| parent | aed1d5813fbf5c5a820dc462b7352474f1153068 (diff) | |
| download | frameworks_av-62cb76f1a38475f0223660d5a9776d5e413b4160.zip frameworks_av-62cb76f1a38475f0223660d5a9776d5e413b4160.tar.gz frameworks_av-62cb76f1a38475f0223660d5a9776d5e413b4160.tar.bz2 | |
Resolved conflicts for merge of aed1d581 to lmp-dev-plus-aosp
Change-Id: Ib3877bfb60774d056fa2d934d2f4cb74e3b235ea
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 c85b964..64fe8d1 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 \ @@ -142,11 +137,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 81ef9fe..8284490 100644 --- a/media/libstagefright/codecs/mp3dec/Android.mk +++ b/media/libstagefright/codecs/mp3dec/Android.mk @@ -52,11 +52,6 @@ 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 @@ -84,11 +79,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 |