diff --git a/android.sh b/android.sh index 4d4e023..0484afd 100755 --- a/android.sh +++ b/android.sh @@ -138,6 +138,10 @@ while [ ! $# -eq 0 ]; do --no-ffmpeg-kit-protocols) export NO_FFMPEG_KIT_PROTOCOLS="1" ;; + --toolchain=*) + ANDROID_TOOLCHAIN=$(echo $1 | sed -e 's/^--[a-z]*=//g') + export ANDROID_TOOLCHAIN="${ANDROID_TOOLCHAIN}" + ;; *) print_unknown_option "$1" ;; @@ -150,6 +154,12 @@ if [[ -z ${BUILD_VERSION} ]]; then exit 1 fi +if [[ -z ${ANDROID_TOOLCHAIN} ]]; then + export ANDROID_TOOLCHAIN="${ANDROID_NDK_ROOT}"/toolchains/llvm/prebuilt/"$(get_toolchain)" +fi + +echo -e "INFO: Using Android toolchain at ${ANDROID_TOOLCHAIN}\n" 1>>"${BASEDIR}"/build.log 2>&1 + # PROCESS FULL OPTION AS LAST OPTION if [[ -n ${BUILD_FULL} ]]; then for library in {0..61}; do @@ -227,8 +237,6 @@ for run_arch in {0..12}; do fi export ARCH=$(get_arch_name $run_arch) - export TOOLCHAIN=$(get_toolchain) - export TOOLCHAIN_ARCH=$(get_toolchain_arch) # EXECUTE MAIN BUILD SCRIPT . "${BASEDIR}"/scripts/main-android.sh "${ENABLED_LIBRARIES[@]}" || exit 1 diff --git a/scripts/android/chromaprint.sh b/scripts/android/chromaprint.sh index 947ab55..5646734 100755 --- a/scripts/android/chromaprint.sh +++ b/scripts/android/chromaprint.sh @@ -13,11 +13,11 @@ cmake -Wno-dev \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${LIB_INSTALL_PREFIX}" \ -DCMAKE_SYSTEM_NAME=Generic \ - -DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CC" \ - -DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CXX" \ - -DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$LD" \ - -DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AR" \ - -DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AS" \ + -DCMAKE_C_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CC" \ + -DCMAKE_CXX_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CXX" \ + -DCMAKE_LINKER="${ANDROID_TOOLCHAIN}/bin/$LD" \ + -DCMAKE_AR="${ANDROID_TOOLCHAIN}/bin/$AR" \ + -DCMAKE_AS="${ANDROID_TOOLCHAIN}/bin/$AS" \ -DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_system_processor) \ -DCMAKE_POSITION_INDEPENDENT_CODE=1 \ -DFFT_LIB=kissfft \ diff --git a/scripts/android/ffmpeg.sh b/scripts/android/ffmpeg.sh index 5138bca..5f8aca1 100755 --- a/scripts/android/ffmpeg.sh +++ b/scripts/android/ffmpeg.sh @@ -17,7 +17,7 @@ echo -e "INFO: $(uname -a)\n" 1>>"${BASEDIR}"/build.log 2>&1 echo -e "----------------------------------------------------------------\n" 1>>"${BASEDIR}"/build.log 2>&1 FFMPEG_LIBRARY_PATH="${LIB_INSTALL_BASE}/${LIB_NAME}" -ANDROID_SYSROOT="${ANDROID_NDK_ROOT}"/toolchains/llvm/prebuilt/"${TOOLCHAIN}"/sysroot +ANDROID_SYSROOT="${ANDROID_TOOLCHAIN}"/sysroot # SET PATHS set_toolchain_paths "${LIB_NAME}" diff --git a/scripts/android/jpeg.sh b/scripts/android/jpeg.sh index 5914ab3..c8d3e61 100755 --- a/scripts/android/jpeg.sh +++ b/scripts/android/jpeg.sh @@ -13,11 +13,11 @@ cmake -Wno-dev \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${LIB_INSTALL_PREFIX}" \ -DCMAKE_SYSTEM_NAME=Generic \ - -DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CC" \ - -DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CXX" \ - -DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$LD" \ - -DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AR" \ - -DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AS" \ + -DCMAKE_C_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CC" \ + -DCMAKE_CXX_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CXX" \ + -DCMAKE_LINKER="${ANDROID_TOOLCHAIN}/bin/$LD" \ + -DCMAKE_AR="${ANDROID_TOOLCHAIN}/bin/$AR" \ + -DCMAKE_AS="${ANDROID_TOOLCHAIN}/bin/$AS" \ -DCMAKE_POSITION_INDEPENDENT_CODE=1 \ -DENABLE_STATIC=1 \ -DENABLE_SHARED=0 \ diff --git a/scripts/android/libaom.sh b/scripts/android/libaom.sh index 9180c88..fa5548f 100755 --- a/scripts/android/libaom.sh +++ b/scripts/android/libaom.sh @@ -37,11 +37,11 @@ cmake -Wno-dev \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SYSTEM_NAME=Generic \ -DCMAKE_INSTALL_PREFIX="${LIB_INSTALL_PREFIX}" \ - -DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CXX" \ - -DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CC" \ - -DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$LD" \ - -DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AR" \ - -DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AS" \ + -DCMAKE_CXX_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CXX" \ + -DCMAKE_C_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CC" \ + -DCMAKE_LINKER="${ANDROID_TOOLCHAIN}/bin/$LD" \ + -DCMAKE_AR="${ANDROID_TOOLCHAIN}/bin/$AR" \ + -DCMAKE_AS="${ANDROID_TOOLCHAIN}/bin/$AS" \ -DCMAKE_POSITION_INDEPENDENT_CODE=1 \ ${ASM_OPTIONS} \ -DENABLE_TESTS=0 \ diff --git a/scripts/android/libilbc.sh b/scripts/android/libilbc.sh index 2272499..1ef8e4c 100755 --- a/scripts/android/libilbc.sh +++ b/scripts/android/libilbc.sh @@ -17,11 +17,11 @@ cmake -Wno-dev \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${LIB_INSTALL_PREFIX}" \ -DCMAKE_SYSTEM_NAME=Generic \ - -DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CC" \ - -DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CXX" \ - -DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$LD" \ - -DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AR" \ - -DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AS" \ + -DCMAKE_C_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CC" \ + -DCMAKE_CXX_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CXX" \ + -DCMAKE_LINKER="${ANDROID_TOOLCHAIN}/bin/$LD" \ + -DCMAKE_AR="${ANDROID_TOOLCHAIN}/bin/$AR" \ + -DCMAKE_AS="${ANDROID_TOOLCHAIN}/bin/$AS" \ -DCMAKE_POSITION_INDEPENDENT_CODE=1 \ -DWEBRTC_ANDROID=1 \ -DUNIX=1 \ diff --git a/scripts/android/libvidstab.sh b/scripts/android/libvidstab.sh index 8803af9..ccb4895 100755 --- a/scripts/android/libvidstab.sh +++ b/scripts/android/libvidstab.sh @@ -27,10 +27,10 @@ cmake -Wno-dev \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${LIB_INSTALL_PREFIX}" \ -DCMAKE_SYSTEM_NAME=Generic \ - -DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CC" \ - -DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$LD" \ - -DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AR" \ - -DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AS" \ + -DCMAKE_C_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CC" \ + -DCMAKE_LINKER="${ANDROID_TOOLCHAIN}/bin/$LD" \ + -DCMAKE_AR="${ANDROID_TOOLCHAIN}/bin/$AR" \ + -DCMAKE_AS="${ANDROID_TOOLCHAIN}/bin/$AS" \ -DCMAKE_POSITION_INDEPENDENT_CODE=1 \ -DUSE_OMP=0 \ ${ASM_OPTIONS} \ diff --git a/scripts/android/openh264.sh b/scripts/android/openh264.sh index 084433a..68ccb85 100755 --- a/scripts/android/openh264.sh +++ b/scripts/android/openh264.sh @@ -6,16 +6,28 @@ export LDFLAGS="$LDFLAGS $(pkg-config --libs --static libiconv) $(pkg-config --l # SET BUILD OPTIONS case ${ARCH} in +arm-v7a) + BUILD_ARCH=arm + CFLAGS+=" -DANDROID_NDK" + ;; arm-v7a-neon) ASM_OPTIONS=arm + BUILD_ARCH=arm CFLAGS+=" -DHAVE_NEON -DANDROID_NDK" ;; arm64-v8a) ASM_OPTIONS=arm64 + BUILD_ARCH=arm64 CFLAGS+=" -DHAVE_NEON_AARCH64 -DANDROID_NDK" ;; -x86*) +x86) + ASM_OPTIONS=x86 + BUILD_ARCH=x86 + CFLAGS+=" -DHAVE_AVX2 -DANDROID_NDK" + ;; +x86-64) ASM_OPTIONS=x86 + BUILD_ARCH=x86_64 CFLAGS+=" -DHAVE_AVX2 -DANDROID_NDK" ;; esac @@ -33,10 +45,11 @@ ${SED_INLINE} 's/^COMMON_OBJS +=/# COMMON_OBJS +=/' "${BASEDIR}"/src/"${LIB_NAME ${SED_INLINE} 's/^COMMON_CFLAGS +=/# COMMON_CFLAGS +=/' "${BASEDIR}"/src/"${LIB_NAME}"/build/platform-android.mk make -j$(get_cpu_count) \ - ARCH="$(get_toolchain_arch)" \ - CC="$CC" \ - CFLAGS="$CFLAGS" \ - CXX="$CXX" \ + ARCH="${BUILD_ARCH}" \ + CC="${CC}" \ + CFLAGS="${CFLAGS}" \ + CXX="${CXX}" \ + AR="${AR}" \ CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="${LDFLAGS}" \ OS=android \ @@ -44,7 +57,6 @@ make -j$(get_cpu_count) \ NDKLEVEL="${API}" \ NDKROOT="${ANDROID_NDK_ROOT}" \ NDK_TOOLCHAIN_VERSION=clang \ - AR="$AR" \ ASM_OPTIONS=${ASM_OPTIONS} \ TARGET="android-${API}" install-static || return 1 diff --git a/scripts/android/snappy.sh b/scripts/android/snappy.sh index 336b9fd..c102051 100755 --- a/scripts/android/snappy.sh +++ b/scripts/android/snappy.sh @@ -13,11 +13,11 @@ cmake -Wno-dev \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${LIB_INSTALL_PREFIX}" \ -DCMAKE_SYSTEM_NAME=Generic \ - -DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CXX" \ - -DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CC" \ - -DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$LD" \ - -DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AR" \ - -DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AS" \ + -DCMAKE_CXX_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CXX" \ + -DCMAKE_C_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CC" \ + -DCMAKE_LINKER="${ANDROID_TOOLCHAIN}/bin/$LD" \ + -DCMAKE_AR="${ANDROID_TOOLCHAIN}/bin/$AR" \ + -DCMAKE_AS="${ANDROID_TOOLCHAIN}/bin/$AS" \ -DCMAKE_POSITION_INDEPENDENT_CODE=1 \ -DSNAPPY_BUILD_TESTS=0 \ -DSNAPPY_BUILD_BENCHMARKS=0 \ diff --git a/scripts/android/soxr.sh b/scripts/android/soxr.sh index 870e63b..28508b4 100755 --- a/scripts/android/soxr.sh +++ b/scripts/android/soxr.sh @@ -13,11 +13,11 @@ cmake -Wno-dev \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${LIB_INSTALL_PREFIX}" \ -DCMAKE_SYSTEM_NAME=Generic \ - -DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CXX" \ - -DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CC" \ - -DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$LD" \ - -DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AR" \ - -DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AS" \ + -DCMAKE_CXX_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CXX" \ + -DCMAKE_C_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CC" \ + -DCMAKE_LINKER="${ANDROID_TOOLCHAIN}/bin/$LD" \ + -DCMAKE_AR="${ANDROID_TOOLCHAIN}/bin/$AR" \ + -DCMAKE_AS="${ANDROID_TOOLCHAIN}/bin/$AS" \ -DCMAKE_POSITION_INDEPENDENT_CODE=1 \ -DBUILD_TESTS=0 \ -DWITH_DEV_TRACE=0 \ diff --git a/scripts/android/srt.sh b/scripts/android/srt.sh index f0b3f42..b49811d 100644 --- a/scripts/android/srt.sh +++ b/scripts/android/srt.sh @@ -36,11 +36,11 @@ cmake -Wno-dev \ -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_SYSTEM_VERSION=${API} \ -DCMAKE_ANDROID_NDK=${ANDROID_NDK_ROOT} \ - -DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CXX" \ - -DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CC" \ - -DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$LD" \ - -DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AR" \ - -DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AS" \ + -DCMAKE_CXX_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CXX" \ + -DCMAKE_C_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CC" \ + -DCMAKE_LINKER="${ANDROID_TOOLCHAIN}/bin/$LD" \ + -DCMAKE_AR="${ANDROID_TOOLCHAIN}/bin/$AR" \ + -DCMAKE_AS="${ANDROID_TOOLCHAIN}/bin/$AS" \ -DCMAKE_SYSTEM_LOADED=1 \ -DCMAKE_SYSTEM_PROCESSOR="${SYSTEM_PROCESSOR}" \ -DENABLE_STDCXX_SYNC=1 \ diff --git a/scripts/android/x265.sh b/scripts/android/x265.sh index 937fa5a..56923c1 100755 --- a/scripts/android/x265.sh +++ b/scripts/android/x265.sh @@ -1,19 +1,22 @@ #!/bin/bash # SET BUILD OPTIONS +git checkout "${BASEDIR}"/src/"${LIB_NAME}"/source/CMakeLists.txt || return 1 ASM_OPTIONS="" case ${ARCH} in arm-v7a | arm-v7a-neon) - ASM_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=1" + ASM_OPTIONS="-DENABLE_ASSEMBLY=0" + ${SED_INLINE} "s|ARM_ARGS -mcpu=native.*|ARM_ARGS $(get_arch_specific_cflags) --target=$(get_clang_host))|g" "${BASEDIR}"/src/"${LIB_NAME}"/source/CMakeLists.txt || return 1 ;; arm64-v8a) - ASM_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=1" + ASM_OPTIONS="-DENABLE_ASSEMBLY=1" + ${SED_INLINE} "s|ARM_ARGS -fPIC -flax-vector-conversions.*|ARM_ARGS --target=$(get_clang_host) -fPIC -flax-vector-conversions)|g" "${BASEDIR}"/src/"${LIB_NAME}"/source/CMakeLists.txt || return 1 ;; x86) - ASM_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=0" + ASM_OPTIONS="-DENABLE_ASSEMBLY=0" ;; x86-64) - ASM_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=0" + ASM_OPTIONS="-DENABLE_ASSEMBLY=1" ;; esac @@ -28,23 +31,23 @@ cmake -Wno-dev \ -DCMAKE_C_FLAGS="${CFLAGS}" \ -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \ - -DCMAKE_SYSROOT="${ANDROID_SYSROOT}" \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_SYSROOT}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="${LIB_INSTALL_PREFIX}" \ - -DCMAKE_SYSTEM_NAME=Generic \ - -DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CC" \ - -DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CXX" \ - -DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$LD" \ - -DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AR" \ - -DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AS" \ + -DCMAKE_SYSTEM_NAME=Android \ + -DCMAKE_CROSSCOMPILING=True \ + -DCMAKE_SYSTEM_VERSION=${API} \ + -DCMAKE_C_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CC" \ + -DCMAKE_CXX_COMPILER="${ANDROID_TOOLCHAIN}/bin/$CXX" \ + -DCMAKE_LINKER="${ANDROID_TOOLCHAIN}/bin/$LD" \ + -DCMAKE_AR="${ANDROID_TOOLCHAIN}/bin/$AR" \ -DCMAKE_POSITION_INDEPENDENT_CODE=1 \ -DSTATIC_LINK_CRT=1 \ -DENABLE_PIC=1 \ -DENABLE_CLI=0 \ -DHIGH_BIT_DEPTH=1 \ ${ASM_OPTIONS} \ - -DCMAKE_SYSTEM_PROCESSOR="${ARCH}" \ + -DCMAKE_SYSTEM_PROCESSOR="$(get_cmake_system_processor)"\ -DENABLE_SHARED=0 "${BASEDIR}"/src/"${LIB_NAME}"/source || return 1 make -j$(get_cpu_count) || return 1 @@ -52,4 +55,4 @@ make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_x265_package_config "3.4" || return 1 +create_x265_package_config "3.6" || return 1 diff --git a/scripts/function-android.sh b/scripts/function-android.sh index 4ea29f2..9459e5e 100755 --- a/scripts/function-android.sh +++ b/scripts/function-android.sh @@ -33,7 +33,7 @@ under the prebuilt folder.\n" echo -e "Usage: ./$COMMAND [OPTION]... [VAR=VALUE]...\n" echo -e "Specify environment variables as VARIABLE=VALUE to override default build options.\n" - display_help_options " -l, --lts\t\t\tbuild lts packages to support API 16+ devices" " --api-level=api\t\toverride Android api level" " --no-ffmpeg-kit-protocols\tdisable custom ffmpeg-kit protocols (saf)" + display_help_options " -l, --lts\t\t\tbuild lts packages to support API 16+ devices\n --api-level=api\t\toverride Android api level\n --toolchain=path\t\toverride the default (llvm) toolchain path\n --no-ffmpeg-kit-protocols\tdisable custom ffmpeg-kit protocols (saf)" display_help_licensing echo -e "Architectures:" @@ -155,13 +155,13 @@ get_toolchain() { get_cmake_system_processor() { case ${ARCH} in arm-v7a | arm-v7a-neon) - echo "arm" + echo "armv7-a" ;; arm64-v8a) echo "aarch64" ;; x86) - echo "x86" + echo "i686" ;; x86-64) echo "x86_64" @@ -192,16 +192,16 @@ get_target_cpu() { get_toolchain_arch() { case ${ARCH} in arm-v7a | arm-v7a-neon) - echo "arm" + echo "arm-linux-androideabi" ;; arm64-v8a) - echo "arm64" + echo "aarch64-linux-android" ;; x86) - echo "x86" + echo "i686-linux-android" ;; x86-64) - echo "x86_64" + echo "x86_64-linux-android" ;; esac } @@ -224,7 +224,7 @@ get_android_arch() { } get_common_includes() { - echo "-I${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot/usr/include" + echo "-I${ANDROID_TOOLCHAIN}/sysroot/usr/include" } get_common_cflags() { @@ -412,7 +412,7 @@ get_cxxflags() { } get_common_linked_libraries() { - local COMMON_LIBRARY_PATHS="-L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/${HOST}/lib -L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot/usr/lib/${HOST}/${API}" + local COMMON_LIBRARY_PATHS="-L${ANDROID_TOOLCHAIN}/sysroot/usr/lib/${HOST}/${API}" case $1 in ffmpeg) @@ -931,12 +931,12 @@ EOF } create_zlib_system_package_config() { - ZLIB_VERSION=$(grep '#define ZLIB_VERSION' "${ANDROID_NDK_ROOT}"/toolchains/llvm/prebuilt/"${TOOLCHAIN}"/sysroot/usr/include/zlib.h | grep -Eo '\".*\"' | sed -e 's/\"//g') + ZLIB_VERSION=$(grep '#define ZLIB_VERSION' "${ANDROID_TOOLCHAIN}"/sysroot/usr/include/zlib.h | grep -Eo '\".*\"' | sed -e 's/\"//g') cat >"${INSTALL_PKG_CONFIG_DIR}/zlib.pc" <