Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-ffmpeg: Commit

external/ffmpeg


Commit MetaInfo

Revisióna8329fe8a28047b19345c2cd1cd353eed5367314 (tree)
Tiempo2019-12-05 19:18:30
AutorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Android: only add notext to x86

The flag adds text relocations to the shared library.
However, x86_64 should not have it.

Cambiar Resumen

Diferencia

--- a/android/build.mk
+++ b/android/build.mk
@@ -74,7 +74,8 @@ LOCAL_CFLAGS += \
7474 LOCAL_ASFLAGS_x86 := -Pconfig-x86.asm
7575 LOCAL_ASFLAGS_x86_64 := -Pconfig-x86_64.asm
7676
77-LOCAL_LDFLAGS := -Wl,--no-fatal-warnings -Wl,-Bsymbolic -Wl,-z,notext
77+LOCAL_LDFLAGS := -Wl,--no-fatal-warnings -Wl,-Bsymbolic
78+LOCAL_LDFLAGS_x86 := -Wl,-z,notext
7879
7980 LOCAL_CLANG_CFLAGS += -Wno-unknown-attributes
8081 LOCAL_CLANG_ASFLAGS += $(if $(filter x86,$(FFMPEG_ARCH_DIR)),,-no-integrated-as)
Show on old repository browser