Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-ffmpeg: Commit

external/ffmpeg


Commit MetaInfo

Revisiónbd53966f3834b23a8e3485f66b2d5e9f9d78c8cf (tree)
Tiempo2019-12-05 19:18:19
AutorMichael Goffioul <michael.goffioul@linc...>
CommiterChih-Wei Huang

Log Message

Fix compilation for Android Q / x86 target

Cambiar Resumen

Diferencia

--- a/android/build.mk
+++ b/android/build.mk
@@ -61,19 +61,20 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_C_INCLUDES)
6161
6262 LOCAL_CFLAGS += \
6363 -O3 -std=c99 -fno-math-errno -fno-signed-zeros -fomit-frame-pointer \
64- -Wno-pointer-to-int-cast -Wstrict-prototypes -Wempty-body -Wno-parentheses \
64+ -Wno-pointer-to-int-cast -Wno-strict-prototypes -Wempty-body -Wno-parentheses \
6565 -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -Wno-unused-parameter \
6666 -Wno-deprecated-declarations -Wno-missing-field-initializers -Wno-sign-compare \
6767 -Wno-constant-conversion -Wno-incompatible-pointer-types-discards-qualifiers \
6868 -Wno-initializer-overrides -Wno-sometimes-uninitialized \
6969 -Wno-unneeded-internal-declaration -Wno-unused-function -Wno-absolute-value \
70+ -Wno-expansion-to-defined -Wno-string-plus-int \
7071 -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes \
7172 -Werror=return-type -Werror=vla -Wformat -Wno-maybe-uninitialized -fPIC
7273
7374 LOCAL_ASFLAGS_x86 := -Pconfig-x86.asm
7475 LOCAL_ASFLAGS_x86_64 := -Pconfig-x86_64.asm
7576
76-LOCAL_LDFLAGS := -Wl,--no-fatal-warnings -Wl,-Bsymbolic
77+LOCAL_LDFLAGS := -Wl,--no-fatal-warnings -Wl,-Bsymbolic -Wl,-z,notext
7778
7879 LOCAL_CLANG_CFLAGS += -Wno-unknown-attributes
7980 LOCAL_CLANG_ASFLAGS += $(if $(filter x86,$(FFMPEG_ARCH_DIR)),,-no-integrated-as)
Show on old repository browser