Skip to content

Bump CargoKit to latest and update it for Android 16KB pages #3170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fzyzcjy merged 5 commits into from
Jun 7, 2026
Merged

Bump CargoKit to latest and update it for Android 16KB pages #3170

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c56fdeb
Update CargoKit for Android 16KB pages
fzyzcjy Jun 5, 2026
669d1e3
Sync CargoKit example copies
fzyzcjy Jun 5, 2026
6eb09c0
Merge master into CargoKit 16KB page size branch
fzyzcjy Jun 6, 2026
2d3256e
Merge branch 'master' into codex/cargokit-16kb-page-size
fzyzcjy Jun 7, 2026
81c1f94
Point CargoKit templates to merged main
fzyzcjy Jun 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frb_codegen/assets/integration_template/app/rust_builder/cargokit
Open in desktop
Submodule cargokit updated 1 files
+10 −1 build_tool/lib/src/android_environment.dart
2 changes: 1 addition & 1 deletion frb_codegen/assets/integration_template/plugin/cargokit
Open in desktop
Submodule cargokit updated 1 files
+10 −1 build_tool/lib/src/android_environment.dart
16 changes: 15 additions & 1 deletion frb_example/flutter_package/cargokit/build_tool/lib/src/android_environment.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,21 @@ class AndroidEnvironment {
if (rustFlags.isNotEmpty) {
rustFlags = '$rustFlags\x1f';
}
rustFlags = '$rustFlags-L\x1f$workaroundDir';
if (["arm64-v8a", "x86_64"].contains(target.android)) {
rustFlags = '$rustFlags-L\x1f$workaroundDir\x1f';

const pageSizeArgs = [
"-C",
"link-arg=-Wl,--hash-style=both",
"-C",
"link-arg=-Wl,-z,max-page-size=16384"
];
final pageSizeArgsString = pageSizeArgs.join("\x1f");

rustFlags = '$rustFlags$pageSizeArgsString';
} else {
rustFlags = '$rustFlags-L\x1f$workaroundDir';
}
Comment on lines +192 to +206

@gemini-code-assist gemini-code-assist Bot Jun 5, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This logic can be simplified by unconditionally appending the workaround directory flag first, and then conditionally appending the 16KB page size flags if the target is arm64-v8a or x86_64. This avoids duplicating the -L\x1f$workaroundDir string and simplifies the control flow. Additionally, using single quotes for string literals is preferred in Dart.

    rustFlags = '$rustFlags-L\\x1f$workaroundDir';
    if (['arm64-v8a', 'x86_64'].contains(target.android)) {
      const pageSizeArgs = [
        '-C',
        'link-arg=-Wl,--hash-style=both',
        '-C',
        'link-arg=-Wl,-z,max-page-size=16384',
      ];
      rustFlags = '$rustFlags\\x1f${pageSizeArgs.join("\\x1f")}';
    }
References
  1. PREFER using single quotes for string literals. (link)

return rustFlags;
}
}
16 changes: 15 additions & 1 deletion ...mple/flutter_via_create/rust_builder/cargokit/build_tool/lib/src/android_environment.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,21 @@ class AndroidEnvironment {
if (rustFlags.isNotEmpty) {
rustFlags = '$rustFlags\x1f';
}
rustFlags = '$rustFlags-L\x1f$workaroundDir';
if (["arm64-v8a", "x86_64"].contains(target.android)) {
rustFlags = '$rustFlags-L\x1f$workaroundDir\x1f';

const pageSizeArgs = [
"-C",
"link-arg=-Wl,--hash-style=both",
"-C",
"link-arg=-Wl,-z,max-page-size=16384"
];
final pageSizeArgsString = pageSizeArgs.join("\x1f");

rustFlags = '$rustFlags$pageSizeArgsString';
} else {
rustFlags = '$rustFlags-L\x1f$workaroundDir';
}
Comment on lines +192 to +206

@gemini-code-assist gemini-code-assist Bot Jun 5, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This logic can be simplified by unconditionally appending the workaround directory flag first, and then conditionally appending the 16KB page size flags if the target is arm64-v8a or x86_64. This avoids duplicating the -L\x1f$workaroundDir string and simplifies the control flow. Additionally, using single quotes for string literals is preferred in Dart.

    rustFlags = '$rustFlags-L\\x1f$workaroundDir';
    if (['arm64-v8a', 'x86_64'].contains(target.android)) {
      const pageSizeArgs = [
        '-C',
        'link-arg=-Wl,--hash-style=both',
        '-C',
        'link-arg=-Wl,-z,max-page-size=16384',
      ];
      rustFlags = '$rustFlags\\x1f${pageSizeArgs.join("\\x1f")}';
    }
References
  1. PREFER using single quotes for string literals. (link)

return rustFlags;
}
}
16 changes: 15 additions & 1 deletion ...e/flutter_via_integrate/rust_builder/cargokit/build_tool/lib/src/android_environment.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,21 @@ class AndroidEnvironment {
if (rustFlags.isNotEmpty) {
rustFlags = '$rustFlags\x1f';
}
rustFlags = '$rustFlags-L\x1f$workaroundDir';
if (["arm64-v8a", "x86_64"].contains(target.android)) {
rustFlags = '$rustFlags-L\x1f$workaroundDir\x1f';

const pageSizeArgs = [
"-C",
"link-arg=-Wl,--hash-style=both",
"-C",
"link-arg=-Wl,-z,max-page-size=16384"
];
final pageSizeArgsString = pageSizeArgs.join("\x1f");

rustFlags = '$rustFlags$pageSizeArgsString';
} else {
rustFlags = '$rustFlags-L\x1f$workaroundDir';
}
Comment on lines +192 to +206

@gemini-code-assist gemini-code-assist Bot Jun 5, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This logic can be simplified by unconditionally appending the workaround directory flag first, and then conditionally appending the 16KB page size flags if the target is arm64-v8a or x86_64. This avoids duplicating the -L\x1f$workaroundDir string and simplifies the control flow. Additionally, using single quotes for string literals is preferred in Dart.

    rustFlags = '$rustFlags-L\\x1f$workaroundDir';
    if (['arm64-v8a', 'x86_64'].contains(target.android)) {
      const pageSizeArgs = [
        '-C',
        'link-arg=-Wl,--hash-style=both',
        '-C',
        'link-arg=-Wl,-z,max-page-size=16384',
      ];
      rustFlags = '$rustFlags\\x1f${pageSizeArgs.join("\\x1f")}';
    }
References
  1. PREFER using single quotes for string literals. (link)

return rustFlags;
}
}
16 changes: 15 additions & 1 deletion frb_example/gallery/rust_builder/cargokit/build_tool/lib/src/android_environment.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,21 @@ class AndroidEnvironment {
if (rustFlags.isNotEmpty) {
rustFlags = '$rustFlags\x1f';
}
rustFlags = '$rustFlags-L\x1f$workaroundDir';
if (["arm64-v8a", "x86_64"].contains(target.android)) {
rustFlags = '$rustFlags-L\x1f$workaroundDir\x1f';

const pageSizeArgs = [
"-C",
"link-arg=-Wl,--hash-style=both",
"-C",
"link-arg=-Wl,-z,max-page-size=16384"
];
final pageSizeArgsString = pageSizeArgs.join("\x1f");

rustFlags = '$rustFlags$pageSizeArgsString';
} else {
rustFlags = '$rustFlags-L\x1f$workaroundDir';
}
Comment on lines +192 to +206

@gemini-code-assist gemini-code-assist Bot Jun 5, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This logic can be simplified by unconditionally appending the workaround directory flag first, and then conditionally appending the 16KB page size flags if the target is arm64-v8a or x86_64. This avoids duplicating the -L\x1f$workaroundDir string and simplifies the control flow. Additionally, using single quotes for string literals is preferred in Dart.

    rustFlags = '$rustFlags-L\\x1f$workaroundDir';
    if (['arm64-v8a', 'x86_64'].contains(target.android)) {
      const pageSizeArgs = [
        '-C',
        'link-arg=-Wl,--hash-style=both',
        '-C',
        'link-arg=-Wl,-z,max-page-size=16384',
      ];
      rustFlags = '$rustFlags\\x1f${pageSizeArgs.join("\\x1f")}';
    }
References
  1. PREFER using single quotes for string literals. (link)

return rustFlags;
}
}
16 changes: 15 additions & 1 deletion ...e/integrate_third_party/rust_builder/cargokit/build_tool/lib/src/android_environment.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,21 @@ class AndroidEnvironment {
if (rustFlags.isNotEmpty) {
rustFlags = '$rustFlags\x1f';
}
rustFlags = '$rustFlags-L\x1f$workaroundDir';
if (["arm64-v8a", "x86_64"].contains(target.android)) {
rustFlags = '$rustFlags-L\x1f$workaroundDir\x1f';

const pageSizeArgs = [
"-C",
"link-arg=-Wl,--hash-style=both",
"-C",
"link-arg=-Wl,-z,max-page-size=16384"
];
final pageSizeArgsString = pageSizeArgs.join("\x1f");

rustFlags = '$rustFlags$pageSizeArgsString';
} else {
rustFlags = '$rustFlags-L\x1f$workaroundDir';
}
Comment on lines +192 to +206

@gemini-code-assist gemini-code-assist Bot Jun 5, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This logic can be simplified by unconditionally appending the workaround directory flag first, and then conditionally appending the 16KB page size flags if the target is arm64-v8a or x86_64. This avoids duplicating the -L\x1f$workaroundDir string and simplifies the control flow. Additionally, using single quotes for string literals is preferred in Dart.

    rustFlags = '$rustFlags-L\\x1f$workaroundDir';
    if (['arm64-v8a', 'x86_64'].contains(target.android)) {
      const pageSizeArgs = [
        '-C',
        'link-arg=-Wl,--hash-style=both',
        '-C',
        'link-arg=-Wl,-z,max-page-size=16384',
      ];
      rustFlags = '$rustFlags\\x1f${pageSizeArgs.join("\\x1f")}';
    }
References
  1. PREFER using single quotes for string literals. (link)

return rustFlags;
}
}
16 changes: 15 additions & 1 deletion ...mple/rust_ui_counter/ui/rust_builder/cargokit/build_tool/lib/src/android_environment.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,21 @@ class AndroidEnvironment {
if (rustFlags.isNotEmpty) {
rustFlags = '$rustFlags\x1f';
}
rustFlags = '$rustFlags-L\x1f$workaroundDir';
if (["arm64-v8a", "x86_64"].contains(target.android)) {
rustFlags = '$rustFlags-L\x1f$workaroundDir\x1f';

const pageSizeArgs = [
"-C",
"link-arg=-Wl,--hash-style=both",
"-C",
"link-arg=-Wl,-z,max-page-size=16384"
];
final pageSizeArgsString = pageSizeArgs.join("\x1f");

rustFlags = '$rustFlags$pageSizeArgsString';
} else {
rustFlags = '$rustFlags-L\x1f$workaroundDir';
}
Comment on lines +192 to +206

@gemini-code-assist gemini-code-assist Bot Jun 5, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This logic can be simplified by unconditionally appending the workaround directory flag first, and then conditionally appending the 16KB page size flags if the target is arm64-v8a or x86_64. This avoids duplicating the -L\x1f$workaroundDir string and simplifies the control flow. Additionally, using single quotes for string literals is preferred in Dart.

    rustFlags = '$rustFlags-L\\x1f$workaroundDir';
    if (['arm64-v8a', 'x86_64'].contains(target.android)) {
      const pageSizeArgs = [
        '-C',
        'link-arg=-Wl,--hash-style=both',
        '-C',
        'link-arg=-Wl,-z,max-page-size=16384',
      ];
      rustFlags = '$rustFlags\\x1f${pageSizeArgs.join("\\x1f")}';
    }
References
  1. PREFER using single quotes for string literals. (link)

return rustFlags;
}
}
16 changes: 15 additions & 1 deletion ...le/rust_ui_todo_list/ui/rust_builder/cargokit/build_tool/lib/src/android_environment.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,21 @@ class AndroidEnvironment {
if (rustFlags.isNotEmpty) {
rustFlags = '$rustFlags\x1f';
}
rustFlags = '$rustFlags-L\x1f$workaroundDir';
if (["arm64-v8a", "x86_64"].contains(target.android)) {
rustFlags = '$rustFlags-L\x1f$workaroundDir\x1f';

const pageSizeArgs = [
"-C",
"link-arg=-Wl,--hash-style=both",
"-C",
"link-arg=-Wl,-z,max-page-size=16384"
];
final pageSizeArgsString = pageSizeArgs.join("\x1f");

rustFlags = '$rustFlags$pageSizeArgsString';
} else {
rustFlags = '$rustFlags-L\x1f$workaroundDir';
}
Comment on lines +192 to +206

@gemini-code-assist gemini-code-assist Bot Jun 5, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This logic can be simplified by unconditionally appending the workaround directory flag first, and then conditionally appending the 16KB page size flags if the target is arm64-v8a or x86_64. This avoids duplicating the -L\x1f$workaroundDir string and simplifies the control flow. Additionally, using single quotes for string literals is preferred in Dart.

    rustFlags = '$rustFlags-L\\x1f$workaroundDir';
    if (['arm64-v8a', 'x86_64'].contains(target.android)) {
      const pageSizeArgs = [
        '-C',
        'link-arg=-Wl,--hash-style=both',
        '-C',
        'link-arg=-Wl,-z,max-page-size=16384',
      ];
      rustFlags = '$rustFlags\\x1f${pageSizeArgs.join("\\x1f")}';
    }
References
  1. PREFER using single quotes for string literals. (link)

return rustFlags;
}
}
Loading