Skip to content

Commit

Permalink
Merge pull request #5 from Javernaut/feature/android-15_16kb-pages
Browse files Browse the repository at this point in the history
Android 15 with 16kb page size support
  • Loading branch information
Javernaut authored Nov 26, 2024
2 parents 098c934 + 746ea08 commit a7085ac
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ffmpeg-android-maker
16 changes: 15 additions & 1 deletion media-file/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {

android {
namespace = "io.github.javernaut.mediafile"
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 21
Expand All @@ -19,6 +19,13 @@ android {
ndk {
abiFilters += listOf("x86", "x86_64", "armeabi-v7a", "arm64-v8a")
}
externalNativeBuild {
cmake {
// NDK r27-specific solution for compatibility with 16 kb page
// Once migrated to NDK r28, this flag will not be needed
arguments += listOf("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")
}
}
}

buildTypes {
Expand Down Expand Up @@ -52,6 +59,13 @@ android {
apiLevel = 34
systemImageSource = "aosp"
}
// TODO Use this device on CI once the issue is resolved: https://issuetracker.google.com/issues/377321470
// For now, local testing is enough to confirm 16 kb pages are implemented properly
create("pixel2api35") {
device = "Pixel 2"
apiLevel = 35
systemImageSource = "google_apis_ps16k"
}
}
}
}
Expand Down

0 comments on commit a7085ac

Please sign in to comment.