Skip to content

Commit a7085ac

Browse files
authored
Merge pull request #5 from Javernaut/feature/android-15_16kb-pages
Android 15 with 16kb page size support
2 parents 098c934 + 746ea08 commit a7085ac

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

media-file/build.gradle.kts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88

99
android {
1010
namespace = "io.github.javernaut.mediafile"
11-
compileSdk = 34
11+
compileSdk = 35
1212

1313
defaultConfig {
1414
minSdk = 21
@@ -19,6 +19,13 @@ android {
1919
ndk {
2020
abiFilters += listOf("x86", "x86_64", "armeabi-v7a", "arm64-v8a")
2121
}
22+
externalNativeBuild {
23+
cmake {
24+
// NDK r27-specific solution for compatibility with 16 kb page
25+
// Once migrated to NDK r28, this flag will not be needed
26+
arguments += listOf("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")
27+
}
28+
}
2229
}
2330

2431
buildTypes {
@@ -52,6 +59,13 @@ android {
5259
apiLevel = 34
5360
systemImageSource = "aosp"
5461
}
62+
// TODO Use this device on CI once the issue is resolved: https://issuetracker.google.com/issues/377321470
63+
// For now, local testing is enough to confirm 16 kb pages are implemented properly
64+
create("pixel2api35") {
65+
device = "Pixel 2"
66+
apiLevel = 35
67+
systemImageSource = "google_apis_ps16k"
68+
}
5569
}
5670
}
5771
}

0 commit comments

Comments
 (0)