test on more android API levels

Author: goderbauer

pkgs/native_toolchain_c/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.16.3
+
+* Support linking for Android.
+
 ## 0.16.2
 
 * Bump the SDK constraint to at least the one from `package:hooks` to fix

pkgs/native_toolchain_c/pubspec.yaml

@@ -1,7 +1,7 @@
 name: native_toolchain_c
 description: >-
   A library to invoke the native C compiler installed on the host machine.
-version: 0.16.2
+version: 0.16.3
 repository: https://github.com/dart-lang/native/tree/main/pkgs/native_toolchain_c
 
 topics:

pkgs/native_toolchain_c/test/cbuilder/cbuilder_cross_android_test.dart

@@ -20,12 +20,6 @@ void main() {
     Architecture.riscv64,
   ];
 
-  /// From https://docs.flutter.dev/reference/supported-platforms.
-  const flutterAndroidNdkVersionLowestSupported = 21;
-
-  /// From https://docs.flutter.dev/reference/supported-platforms.
-  const flutterAndroidNdkVersionHighestSupported = 34;
-
   const optimizationLevels = OptimizationLevel.values;
   var selectOptimizationLevel = 0;
 

pkgs/native_toolchain_c/test/clinker/build_testfiles.dart

@@ -13,9 +13,11 @@ import '../helpers.dart';
 Future<Uri> buildTestArchive(
   Uri tempUri,
   Uri tempUri2,
-  OS os,
-  Architecture architecture,
-) async {
+  OS targetOS,
+  Architecture architecture, {
+  int? androidTargetNdkApi, // Must be specified iff targetOS is OS.android.
+}) async {
+  assert((targetOS != OS.android) == (androidTargetNdkApi == null));
   final test1Uri = packageUri.resolve('test/clinker/testfiles/linker/test1.c');
   final test2Uri = packageUri.resolve('test/clinker/testfiles/linker/test2.c');
   if (!await File.fromUri(test1Uri).exists() ||
@@ -37,15 +39,12 @@ Future<Uri> buildTestArchive(
     ..config.setupBuild(linkingEnabled: false)
     ..addExtension(
       CodeAssetExtension(
-        targetOS: os,
+        targetOS: targetOS,
         targetArchitecture: architecture,
         linkModePreference: LinkModePreference.dynamic,
         cCompiler: cCompiler,
-        android: os == OS.android
-            ? AndroidCodeConfig(
-                // TODO: figure out if we want to test different versions
-                targetNdkApi: 21,
-              )
+        android: androidTargetNdkApi != null
+            ? AndroidCodeConfig(targetNdkApi: androidTargetNdkApi)
             : null,
       ),
     );

pkgs/native_toolchain_c/test/clinker/object_cross_test.dart

@@ -14,7 +14,7 @@ import 'package:test/test.dart';
 
 import 'objects_helper.dart';
 
-Future<void> main() async {
+void main() {
   if (!Platform.isLinux) {
     // Avoid needing status files on Dart SDK CI.
     return;
@@ -28,5 +28,5 @@ Future<void> main() async {
     Architecture.riscv64,
   ]..remove(Architecture.current);
 
-  await runObjectTests(OS.current, architectures);
+  runObjectTests(OS.current, architectures);
 }

pkgs/native_toolchain_c/test/clinker/objects_cross_android_test.dart

@@ -3,10 +3,12 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:code_assets/code_assets.dart';
+import 'package:test/test.dart';
 
+import '../helpers.dart';
 import 'objects_helper.dart';
 
-Future<void> main() async {
+void main() {
   final architectures = [
     Architecture.arm,
     Architecture.arm64,
@@ -17,5 +19,12 @@ Future<void> main() async {
 
   const targetOS = OS.android;
 
-  await runObjectTests(targetOS, architectures);
+  for (final apiLevel in [
+    flutterAndroidNdkVersionLowestSupported,
+    flutterAndroidNdkVersionHighestSupported,
+  ]) {
+    group('Android API$apiLevel', () {
+      runObjectTests(targetOS, architectures, androidTargetNdkApi: apiLevel);
+    });
+  }
 }

pkgs/native_toolchain_c/test/clinker/objects_helper.dart

@@ -12,10 +12,12 @@ import 'package:test/test.dart';
 import '../helpers.dart';
 import 'build_testfiles.dart';
 
-Future<void> runObjectTests(
+void runObjectTests(
   OS targetOS,
-  List<Architecture> architectures,
-) async {
+  List<Architecture> architectures, {
+  int? androidTargetNdkApi, // Must be specified iff targetOS is OS.android.
+}) {
+  assert((targetOS != OS.android) == (androidTargetNdkApi == null));
   const name = 'mylibname';
 
   for (final architecture in architectures) {
@@ -28,6 +30,7 @@ Future<void> runObjectTests(
         tempUri2,
         targetOS,
         architecture,
+        androidTargetNdkApi: androidTargetNdkApi,
       );
 
       final linkInputBuilder = LinkInputBuilder()
@@ -44,8 +47,8 @@ Future<void> runObjectTests(
             targetArchitecture: architecture,
             linkModePreference: LinkModePreference.dynamic,
             cCompiler: cCompiler,
-            android: targetOS == OS.android
-                ? AndroidCodeConfig(targetNdkApi: 21)
+            android: androidTargetNdkApi != null
+                ? AndroidCodeConfig(targetNdkApi: androidTargetNdkApi)
                 : null,
           ),
         );

pkgs/native_toolchain_c/test/clinker/objects_test.dart

@@ -14,11 +14,11 @@ import 'package:test/test.dart';
 
 import 'objects_helper.dart';
 
-Future<void> main() async {
+void main() {
   if (!Platform.isLinux) {
     // Avoid needing status files on Dart SDK CI.
     return;
   }
 
-  await runObjectTests(OS.current, [Architecture.current]);
+  runObjectTests(OS.current, [Architecture.current]);
 }

pkgs/native_toolchain_c/test/clinker/throws_test.dart

@@ -9,7 +9,7 @@ import 'package:test/test.dart';
 
 import '../helpers.dart';
 
-Future<void> main() async {
+void main() {
   for (final targetOS in OS.values) {
     if (targetOS == OS.linux || targetOS == OS.android) {
       // Is implemented.

pkgs/native_toolchain_c/test/clinker/treeshake_cross_android_test.dart

@@ -3,10 +3,12 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:code_assets/code_assets.dart';
+import 'package:test/test.dart';
 
+import '../helpers.dart';
 import 'treeshake_helper.dart';
 
-Future<void> main() async {
+void main() {
   final architectures = [
     Architecture.arm,
     Architecture.arm64,
@@ -17,5 +19,12 @@ Future<void> main() async {
 
   const targetOS = OS.android;
 
-  await runTreeshakeTests(targetOS, architectures);
+  for (final apiLevel in [
+    flutterAndroidNdkVersionLowestSupported,
+    flutterAndroidNdkVersionHighestSupported,
+  ]) {
+    group('Android API$apiLevel', () {
+      runTreeshakeTests(targetOS, architectures, androidTargetNdkApi: apiLevel);
+    });
+  }
 }

pkgs/native_toolchain_c/test/clinker/treeshake_cross_test.dart

@@ -14,7 +14,7 @@ import 'package:test/test.dart';
 
 import 'treeshake_helper.dart';
 
-Future<void> main() async {
+void main() {
   if (!Platform.isLinux) {
     // Avoid needing status files on Dart SDK CI.
     return;
@@ -28,5 +28,5 @@ Future<void> main() async {
     Architecture.riscv64,
   ]..remove(Architecture.current);
 
-  await runTreeshakeTests(OS.current, architectures);
+  runTreeshakeTests(OS.current, architectures);
 }

pkgs/native_toolchain_c/test/clinker/treeshake_helper.dart

@@ -12,10 +12,12 @@ import 'package:test/test.dart';
 import '../helpers.dart';
 import 'build_testfiles.dart';
 
-Future<void> runTreeshakeTests(
+void runTreeshakeTests(
   OS targetOS,
-  List<Architecture> architectures,
-) async {
+  List<Architecture> architectures, {
+  int? androidTargetNdkApi, // Must be specified iff targetOS is OS.android.
+}) {
+  assert((targetOS != OS.android) == (androidTargetNdkApi == null));
   CLinker linkerManual(List<String> sources) => CLinker.library(
     name: 'mylibname',
     assetName: '',
@@ -58,6 +60,7 @@ Future<void> runTreeshakeTests(
           tempUri2,
           targetOS,
           architecture,
+          androidTargetNdkApi: androidTargetNdkApi,
         );
 
         final linkInputBuilder = LinkInputBuilder()
@@ -74,8 +77,8 @@ Future<void> runTreeshakeTests(
               targetArchitecture: architecture,
               linkModePreference: LinkModePreference.dynamic,
               cCompiler: cCompiler,
-              android: targetOS == OS.android
-                  ? AndroidCodeConfig(targetNdkApi: 21)
+              android: androidTargetNdkApi != null
+                  ? AndroidCodeConfig(targetNdkApi: androidTargetNdkApi)
                   : null,
             ),
           );

pkgs/native_toolchain_c/test/clinker/treeshake_test.dart

@@ -14,11 +14,11 @@ import 'package:test/test.dart';
 
 import 'treeshake_helper.dart';
 
-Future<void> main() async {
+void main() {
   if (!Platform.isLinux) {
     // Avoid needing status files on Dart SDK CI.
     return;
   }
 
-  await runTreeshakeTests(OS.current, [Architecture.current]);
+  runTreeshakeTests(OS.current, [Architecture.current]);
 }

pkgs/native_toolchain_c/test/helpers.dart

@@ -303,6 +303,12 @@ Future<void> expectPageSize(Uri dylib, int pageSize) async {
 
 int defaultMacOSVersion = 13;
 
+/// From https://docs.flutter.dev/reference/supported-platforms.
+const flutterAndroidNdkVersionLowestSupported = 21;
+
+/// From https://docs.flutter.dev/reference/supported-platforms.
+const flutterAndroidNdkVersionHighestSupported = 34;
+
 const objdumpFileFormat = {
   Architecture.arm: 'elf32-littlearm',
   Architecture.arm64: 'elf64-littleaarch64',