Skip to content

Commit

Permalink
android: 16K page size
Browse files Browse the repository at this point in the history
  • Loading branch information
wang-bin committed Jul 9, 2024
1 parent 80d3745 commit af0108f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build_gpl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ env:
jobs:
Apple:
# See: https://docs.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow#configuring-a-build-matrix
runs-on: macos-14
runs-on: macos-latest
env:
TARGET_OS: ${{ matrix.target }}
CONFIG_SUFFIX: -gpl-${{ matrix.config }}
Expand All @@ -35,7 +35,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup Xcode
run: sudo xcode-select -s /Applications/Xcode_15.2.app
run: sudo xcode-select -s /Applications/Xcode_15.4.app
- name: Create Build Environment
shell: bash
env:
Expand Down Expand Up @@ -247,7 +247,7 @@ jobs:
path: ffmpeg-*.tar.xz

Android:
runs-on: ubuntu-latest
runs-on: macos-latest
env:
TARGET_OS: android
CONFIG_SUFFIX: -gpl-${{ matrix.config }}
Expand Down
1 change: 1 addition & 0 deletions avbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1023,6 +1023,7 @@ use armv6t2 or -mthumb-interwork: https://gcc.gnu.org/onlinedocs/gcc-4.5.3/gcc/A
fi
fi
fi
[ -z "${ANDROID_ARCH/*64/}" ] && EXTRA_LDFLAGS+=" -Wl,-z,max-page-size=16384" # 16KB page size required by android 15
#test -d $ANDROID_GCC_DIR || $NDK_ROOT/build/tools/make-standalone-toolchain.sh --platform=android-$API_LEVEL --toolchain=$TOOLCHAIN --install-dir=$ANDROID_GCC_DIR #--system=linux-x86_64
TOOLCHAIN_OPT+=" --extra-ldexeflags=\"-Wl,--gc-sections -Wl,-z,nocopyreloc -pie -fPIE $EXE_FLAGS\""
INSTALL_DIR=sdk-android-${1:-${ANDROID_ARCH}}
Expand Down

0 comments on commit af0108f

Please sign in to comment.