Skip to content

Commit 0fcd1cf

Browse files
author
Azure Pipelines
committed
Combined user contributed patches
Which maintainer has not merged into mainline repo. - Add 16KB page size support for Android 15+ superlistapp#569 - chore(deps): update device_info_plus version constraint to <13.0.0 superlistapp#553 - MinRisk: upgrade android compileSdkVersion from 31 -> 36
1 parent 3aec813 commit 0fcd1cf

4 files changed

Lines changed: 19 additions & 4 deletions

File tree

super_context_menu/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies:
1212
sdk: flutter
1313
super_native_extensions: ^0.9.1
1414
collection: ^1.16.0
15-
device_info_plus: ">=10.0.1 <12.0.0"
15+
device_info_plus: ">=10.0.1 <13.0.0"
1616
pixel_snap: ^0.1.1
1717

1818
dev_dependencies:

super_native_extensions/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
namespace 'com.superlist.super_native_extensions'
2727
}
2828

29-
compileSdkVersion 31
29+
compileSdkVersion 36
3030

3131
compileOptions {
3232
sourceCompatibility JavaVersion.VERSION_1_8

super_native_extensions/cargokit/build_tool/lib/src/android_environment.dart

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,22 @@ class AndroidEnvironment {
186186
if (rustFlags.isNotEmpty) {
187187
rustFlags = '$rustFlags\x1f';
188188
}
189-
rustFlags = '$rustFlags-L\x1f$workaroundDir';
189+
190+
// 16KB page size fix for Android 15+ (arm64-v8a and x86_64 only)
191+
// https://github.com/superlistapp/super_native_extensions/issues/548
192+
if (['arm64-v8a', 'x86_64'].contains(target.android)) {
193+
rustFlags = '$rustFlags-L\x1f$workaroundDir\x1f';
194+
const pageSizeArgs = [
195+
'-C',
196+
'link-arg=-Wl,--hash-style=both',
197+
'-C',
198+
'link-arg=-Wl,-z,max-page-size=16384',
199+
];
200+
rustFlags = '$rustFlags${pageSizeArgs.join('\x1f')}';
201+
} else {
202+
rustFlags = '$rustFlags-L\x1f$workaroundDir';
203+
}
204+
190205
return rustFlags;
191206
}
192207
}

super_native_extensions/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies:
1919
uuid: ^4.1.0
2020
irondash_engine_context: ^0.5.5
2121
irondash_message_channel: ^0.7.0
22-
device_info_plus: ">=10.0.1 <12.0.0"
22+
device_info_plus: ">=10.0.1 <13.0.0"
2323
pixel_snap: ^0.1.2
2424
web: ^1.0.0
2525

0 commit comments

Comments
 (0)