| 修订版 | bd53966f3834b23a8e3485f66b2d5e9f9d78c8cf (tree) |
|---|---|
| 时间 | 2019-12-05 19:18:19 |
| 作者 | Michael Goffioul <michael.goffioul@linc...> |
| Commiter | Chih-Wei Huang |
Fix compilation for Android Q / x86 target
android/build.mk (diff)| @@ -61,19 +61,20 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_C_INCLUDES) | ||
| 61 | 61 | |
| 62 | 62 | LOCAL_CFLAGS += \ |
| 63 | 63 | -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 \ | |
| 65 | 65 | -Wno-switch -Wno-format-zero-length -Wno-pointer-sign -Wno-unused-parameter \ |
| 66 | 66 | -Wno-deprecated-declarations -Wno-missing-field-initializers -Wno-sign-compare \ |
| 67 | 67 | -Wno-constant-conversion -Wno-incompatible-pointer-types-discards-qualifiers \ |
| 68 | 68 | -Wno-initializer-overrides -Wno-sometimes-uninitialized \ |
| 69 | 69 | -Wno-unneeded-internal-declaration -Wno-unused-function -Wno-absolute-value \ |
| 70 | + -Wno-expansion-to-defined -Wno-string-plus-int \ | |
| 70 | 71 | -Werror=format-security -Werror=implicit-function-declaration -Werror=missing-prototypes \ |
| 71 | 72 | -Werror=return-type -Werror=vla -Wformat -Wno-maybe-uninitialized -fPIC |
| 72 | 73 | |
| 73 | 74 | LOCAL_ASFLAGS_x86 := -Pconfig-x86.asm |
| 74 | 75 | LOCAL_ASFLAGS_x86_64 := -Pconfig-x86_64.asm |
| 75 | 76 | |
| 76 | -LOCAL_LDFLAGS := -Wl,--no-fatal-warnings -Wl,-Bsymbolic | |
| 77 | +LOCAL_LDFLAGS := -Wl,--no-fatal-warnings -Wl,-Bsymbolic -Wl,-z,notext | |
| 77 | 78 | |
| 78 | 79 | LOCAL_CLANG_CFLAGS += -Wno-unknown-attributes |
| 79 | 80 | LOCAL_CLANG_ASFLAGS += $(if $(filter x86,$(FFMPEG_ARCH_DIR)),,-no-integrated-as) |
Android-x86
Fork