diff options
| author | Jose Luis Marti <joseluis.marti@gmail.com> | 2023-02-20 17:53:48 +0100 |
|---|---|---|
| committer | Jose Luis Marti <joseluis.marti@gmail.com> | 2023-02-20 17:53:48 +0100 |
| commit | 8dfd52d8ea6365a193afafd0b9c022d6719adb4e (patch) | |
| tree | 8037be5b07e4cfa1ba719d62c50c788541b558cd /tools | |
| parent | 93376f096b94b0d6c3ede8a72c5158464e2cb1fd (diff) | |
[backport][Android] Fix symbol relocation errors on Android x86
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/ffmpeg/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/depends/target/libass/Makefile | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt index f09258058b..4b3ac90856 100644 --- a/tools/depends/target/ffmpeg/CMakeLists.txt +++ b/tools/depends/target/ffmpeg/CMakeLists.txt @@ -86,7 +86,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL android) list(APPEND ffmpeg_conf --cpu=x86_64) list(APPEND ffmpeg_conf --extra-cflags=-mno-stackrealign) else() - list(APPEND ffmpeg_conf --cpu=i686 --disable-mmx) + list(APPEND ffmpeg_conf --cpu=i686 --disable-mmx --disable-asm) list(APPEND ffmpeg_conf --extra-cflags=-mno-stackrealign) endif() elseif(CORE_SYSTEM_NAME STREQUAL darwin_embedded) diff --git a/tools/depends/target/libass/Makefile b/tools/depends/target/libass/Makefile index 6272e051ad..1d1a50a660 100644 --- a/tools/depends/target/libass/Makefile +++ b/tools/depends/target/libass/Makefile @@ -13,6 +13,10 @@ ifeq ($(OS),android) # Android API Level 21/22 requires explicit link. # This doesnt appear to be required for API Level 23+ (Android 6+) export LDFLAGS+= -lstdc++ + + ifeq ($(CPU),i686) + export ASFLAGS+= -DPIC=1 + endif endif # configuration settings |