Skip to content

Commit

Permalink
(#14713) [ffmpeg] Fix armv7 android build
Browse files Browse the repository at this point in the history
get_gnu_triplet() returns androideabi for ARMv7 Android which is not recognized by FFMPEG's configure script.
  • Loading branch information
Mikayex authored Dec 14, 2022
1 parent 75ebe88 commit e187a92
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions recipes/ffmpeg/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,8 @@ def _target_os(self):
target_os = triplet.split("-")[2]
if target_os == "gnueabihf":
target_os = "gnu" # could also be "linux"
if target_os.startswith("android"):
target_os = "android"
return target_os

def _patch_sources(self):
Expand Down

0 comments on commit e187a92

Please sign in to comment.