Merge branch 'Javernaut:master' into master

pull/66/head
ClayM0re 3 years ago committed by GitHub
commit 21af5a80d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .github/workflows/compilability_check.yml
  2. 2
      README.md
  3. 2
      scripts/export-build-variables.sh
  4. 2
      scripts/libaom/android.cmake
  5. 2
      scripts/parse-arguments.sh

@ -8,7 +8,7 @@ jobs:
abi: [ "armeabi-v7a", "arm64-v8a", "x86", "x86_64" ]
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup the environment
run: |

@ -13,7 +13,7 @@ The script also produces `ffmpeg` and `ffprobe` executables that can be used in
The main focus of ffmpeg-android-maker is to prepare shared libraries for seamless integration into an Android project. The script prepares the `output` directory that is meant to be used. And it's not the only thing this project does.
By default this script downloads and builds the FFmpeg **5.0**, but the version can be overridden.
By default this script downloads and builds the FFmpeg **5.0.1**, but the version can be overridden.
The details of how this script is implemented are described in this series of posts:
* [Part 1](https://proandroiddev.com/a-story-about-ffmpeg-in-android-part-i-compilation-898e4a249422)

@ -55,6 +55,7 @@ export CROSS_PREFIX_WITH_PATH=${TOOLCHAIN_PATH}/bin/llvm-
# The FAM_ prefix is used to eliminate passing those values implicitly to build systems
export FAM_ADDR2LINE=${CROSS_PREFIX_WITH_PATH}addr2line
export FAM_AR=${CROSS_PREFIX_WITH_PATH}ar
export FAM_AS=${CROSS_PREFIX_WITH_PATH}as
export FAM_NM=${CROSS_PREFIX_WITH_PATH}nm
export FAM_OBJCOPY=${CROSS_PREFIX_WITH_PATH}objcopy
export FAM_OBJDUMP=${CROSS_PREFIX_WITH_PATH}objdump
@ -69,7 +70,6 @@ export TARGET=${TARGET_TRIPLE_MACHINE_CC}-linux-${TARGET_TRIPLE_OS}${ANDROID_PLA
export FAM_CC=${TOOLCHAIN_PATH}/bin/${TARGET}-clang
export FAM_CXX=${FAM_CC}++
export FAM_LD=${FAM_CC}
export FAM_AS=${FAM_CC}
# TODO consider abondaning this strategy of defining the name of the clang wrapper
# in favour of just passing -mstackrealign and -fno-addrsig depending on

@ -16,7 +16,7 @@ include("$ENV{ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake")
if(DEFINED CMAKE_ASM_NASM_COMPILER)
set(AS_EXECUTABLE ${CMAKE_ASM_NASM_COMPILER})
else()
set(AS_EXECUTABLE ${_CMAKE_TOOLCHAIN_PREFIX}as)
set(AS_EXECUTABLE ${ANDROID_ASM_COMPILER})
endif()
# AV1 Codec Library doesn't recognise 'i686' as CMAKE_SYSTEM_PROCESSOR

@ -9,7 +9,7 @@
ABIS_TO_BUILD=()
API_LEVEL=19
SOURCE_TYPE=TAR
SOURCE_VALUE=5.0
SOURCE_VALUE=5.0.1
EXTERNAL_LIBRARIES=()
FFMPEG_GPL_ENABLED=false

Loading…
Cancel
Save