summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/on2
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-08-06 21:38:14 -0700
committerDan Albert <danalbert@google.com>2014-08-07 15:42:27 -0700
commit3b909164de79904137bb6661514d5ca6236a49c9 (patch)
tree206ee7a090ec5d3e0c5e7e97171b264730091812 /media/libstagefright/codecs/on2
parenta018cd4926460f8f5ab30a9a11df9775572d8620 (diff)
downloadframeworks_av-3b909164de79904137bb6661514d5ca6236a49c9.zip
frameworks_av-3b909164de79904137bb6661514d5ca6236a49c9.tar.gz
frameworks_av-3b909164de79904137bb6661514d5ca6236a49c9.tar.bz2
Fix build after side-stepping global -Bsymbolic.
Some of the assembly in the codecs is generating invalid relocations without -Bsymbolic. Leave it on for these projects for the time being. Bug: 16853291 Change-Id: Id70488b077256a70137c4417f21be2c2d1d4341c
Diffstat (limited to 'media/libstagefright/codecs/on2')
-rw-r--r--media/libstagefright/codecs/on2/h264dec/Android.mk5
1 files changed, 5 insertions, 0 deletions
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