diff options
| author | Dan Albert <danalbert@google.com> | 2014-08-09 06:55:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-09 06:55:09 +0000 |
| commit | 2635987008277c20fe6a3f691bade719ea4c33fd (patch) | |
| tree | ff4fc4065f4672a8b698c53109e25066456be988 /media/libstagefright | |
| parent | 937363908fa2738c982af78c8b96626a5a2ba94e (diff) | |
| parent | 2dfe8ea7c131a045067c123efc934ef6ccdb8821 (diff) | |
| download | frameworks_av-2635987008277c20fe6a3f691bade719ea4c33fd.zip frameworks_av-2635987008277c20fe6a3f691bade719ea4c33fd.tar.gz frameworks_av-2635987008277c20fe6a3f691bade719ea4c33fd.tar.bz2 | |
am 2dfe8ea7: Merge changes Idc9808f7,If7bc8e5b into lmp-dev
* commit '2dfe8ea7c131a045067c123efc934ef6ccdb8821':
Fix the build after -Bsymbolic fix.
Fix PIC relocations for non-Bsymbolic builds
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/codecs/hevcdec/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/hevcdec/Android.mk b/media/libstagefright/codecs/hevcdec/Android.mk index 960602f..c0c694e 100644 --- a/media/libstagefright/codecs/hevcdec/Android.mk +++ b/media/libstagefright/codecs/hevcdec/Android.mk @@ -20,6 +20,10 @@ LOCAL_SHARED_LIBRARIES += libstagefright_foundation LOCAL_SHARED_LIBRARIES += libutils LOCAL_SHARED_LIBRARIES += 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 include $(BUILD_SHARED_LIBRARY) |