Unverified Commit e2b9ac48 authored by Christoph's avatar Christoph Committed by GitHub

Fix 16kb page size load alignment for Android (#1110)

As of November Google requires 16kb page sizes for native libraries.

https://developer.android.com/guide/practices/page-sizes

Updated the ndk version in the gradle and docker files

Tested this with the sample app and also with a more complex project.

Fixes [SKIKO-1064](https://youtrack.jetbrains.com/issue/SKIKO-1064)
parent 9c46d5cc
...@@ -146,7 +146,7 @@ jobs: ...@@ -146,7 +146,7 @@ jobs:
name: 'Set up Android NDK' name: 'Set up Android NDK'
id: setup-ndk id: setup-ndk
with: with:
ndk-version: r21e ndk-version: r29
- uses: android-actions/setup-android@v2 - uses: android-actions/setup-android@v2
name: 'Set up Android SDK' name: 'Set up Android SDK'
......
...@@ -24,7 +24,7 @@ RUN yes | $SDK_MANAGER --licenses && \ ...@@ -24,7 +24,7 @@ RUN yes | $SDK_MANAGER --licenses && \
$SDK_MANAGER "platforms;$ANDROID_PLATFORM" && \ $SDK_MANAGER "platforms;$ANDROID_PLATFORM" && \
cd $ANDROID_SDK_ROOT/platforms/$ANDROID_PLATFORM && \ cd $ANDROID_SDK_ROOT/platforms/$ANDROID_PLATFORM && \
ls -1 | grep -v android.jar | xargs rm -rf ls -1 | grep -v android.jar | xargs rm -rf
ARG NDK_VERSION=21.4.7075529 ARG NDK_VERSION=29.0.14206865
RUN $SDK_MANAGER "ndk;$NDK_VERSION" && \ RUN $SDK_MANAGER "ndk;$NDK_VERSION" && \
cd $ANDROID_SDK_ROOT/ndk/$NDK_VERSION && \ cd $ANDROID_SDK_ROOT/ndk/$NDK_VERSION && \
ls -1 | grep -v toolchains | xargs rm -rf ls -1 | grep -v toolchains | xargs rm -rf
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment