Merge pull request #60 from Foundation-Devices/support_16k_page_size

android: support 16K page size and use latest flutter SDK

Author: icota

.github/workflows/check.yml

@@ -28,7 +28,7 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
-          flutter-version: '3.16.3'
+          flutter-version: '3.35.1'
 
       - name: Install dependencies
         run: flutter pub get

.reuse/dep5

@@ -23,6 +23,10 @@ Files: example/windows/flutter/generated*
 Copyright: 2024 Foundation Devices Inc.
 License: MIT
 
+Files: example/android/*
+Copyright: 2024 Foundation Devices Inc.
+License: MIT
+
 Files: rust/target/*
 Copyright: 2024 Foundation Devices Inc.
 License: MIT

android/build.gradle

@@ -15,7 +15,7 @@ buildscript {
 
     dependencies {
         // The Android Gradle Plugin knows how to build native code with the NDK.
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.12.1'
     }
 }
 
@@ -34,7 +34,7 @@ android {
     }
     // Bumping the plugin compileSdkVersion requires all clients of this plugin
     // to bump the version in their app.
-    compileSdkVersion 33
+    compileSdkVersion 36
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

cargokit/build_tool/lib/src/android_environment.dart

@@ -190,7 +190,17 @@ class AndroidEnvironment {
     if (rustFlags.isNotEmpty) {
       rustFlags = '$rustFlags\x1f';
     }
-    rustFlags = '$rustFlags-L\x1f$workaroundDir';
+    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';
     return rustFlags;
   }
 }

cargokit/gradle/plugin.gradle

@@ -1,7 +1,3 @@
-// SPDX-FileCopyrightText: 2024 Foundation Devices Inc.
-//
-// SPDX-License-Identifier: MIT
-
 import java.nio.file.Paths
 import org.apache.tools.ant.taskdefs.condition.Os
 
@@ -87,10 +83,10 @@ class CargoKitPlugin implements Plugin<Project> {
         _findFlutterPlugin(rootProject.childProjects)
     }
 
-   private Plugin _findFlutterPlugin(Map projects) {
+    private Plugin _findFlutterPlugin(Map projects) {
         for (project in projects) {
             for (plugin in project.value.getPlugins()) {
-                if (plugin.class.name == "FlutterPlugin") {
+                if (plugin.class.name == "com.flutter.gradle.FlutterPlugin") {
                     return plugin;
                 }
             }
@@ -123,7 +119,7 @@ class CargoKitPlugin implements Plugin<Project> {
             def jniLibs = project.android.sourceSets.maybeCreate(buildType).jniLibs;
             jniLibs.srcDir(new File(cargoOutputDir))
 
-            def platforms = plugin.getTargetPlatforms().collect()
+            def platforms = com.flutter.gradle.FlutterPluginUtils.getTargetPlatforms(project).collect()
 
             // Same thing addFlutterDependencies does in flutter.gradle
             if (buildType == "debug") {
@@ -145,7 +141,7 @@ class CargoKitPlugin implements Plugin<Project> {
                 }
 
                 def task = project.tasks.create(taskName, CargoKitBuildTask.class) {
-                    buildMode = variant.name
+                    buildMode = variant.buildType.name
                     buildDir = cargoBuildDir
                     outputDir = cargoOutputDir
                     ndkVersion = plugin.project.android.ndkVersion
@@ -167,4 +163,4 @@ class CargoKitPlugin implements Plugin<Project> {
             }
         }
     }
-}
+}

example/.gitignore

@@ -9,9 +9,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related

example/android/app/build.gradle

@@ -1,7 +1,11 @@
 // SPDX-FileCopyrightText: 2024 Foundation Devices Inc.
 //
 // SPDX-License-Identifier: MIT
-
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -10,10 +14,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
@@ -25,10 +25,6 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
     namespace "com.foundationdevices.tor_example"
     compileSdkVersion flutter.compileSdkVersion
@@ -72,5 +68,4 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }