Android-x86
Forkexternal/ffmpeg
| Revision | a8329fe8a28047b19345c2cd1cd353eed5367314 (tree) |
|---|---|
| Time | 2019-12-05 19:18:30 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Android: only add notext to x86
The flag adds text relocations to the shared library.
However, x86_64 should not have it.
android/build.mk (diff)| @@ -74,7 +74,8 @@ LOCAL_CFLAGS += \ | ||
| 74 | 74 | LOCAL_ASFLAGS_x86 := -Pconfig-x86.asm |
| 75 | 75 | LOCAL_ASFLAGS_x86_64 := -Pconfig-x86_64.asm |
| 76 | 76 | |
| 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 | |
| 78 | 79 | |
| 79 | 80 | LOCAL_CLANG_CFLAGS += -Wno-unknown-attributes |
| 80 | 81 | LOCAL_CLANG_ASFLAGS += $(if $(filter x86,$(FFMPEG_ARCH_DIR)),,-no-integrated-as) |
