Flutter support

.gitignore

@@ -27,6 +27,7 @@ doc/api/
 .history
 .vscode
 compile_commands.json
+*.log
 
 # IntelliJ
 *.iml

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.4
+
+* Added support for Android and Flutter Desktops (Windows/Linux).
+
 ## 0.0.3
 
 * Using `package:args` for handling CLI arguments.

android/build.gradle

@@ -41,9 +41,6 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        ndk {
-            abiFilters 'arm64-v8a'
-        }
     }
 }
 

bin/setup.dart

@@ -9,6 +9,7 @@ import 'package:args/command_runner.dart';
 import 'package:cli_util/cli_logging.dart' show Ansi, Logger;
 import 'package:cronet/src/constants.dart';
 import 'package:cronet/src/third_party/ffigen/find_resource.dart';
+import 'package:path/path.dart';
 
 // Extracts a tar.gz file.
 void extract(String fileName, [String dir = '']) {
@@ -28,13 +29,40 @@ void extract(String fileName, [String dir = '']) {
   }
 }
 
+/// Places downloaded mobile binaries to proper location.
+void placeMobileBinaries(String platform, String fileName) {
+  final android =
+      '${findPackageRoot().toFilePath(windows: Platform.isWindows)}/android';
+  Directory('$android/libs').createSync();
+  Directory('$binaryStorageDir/$platform/libs').listSync().forEach((jar) {
+    if (jar is File) {
+      jar.renameSync('$android/libs/${basename(jar.path)}');
+    }
+  });
+  Directory('$android/src/main/jniLibs').createSync();
+  Directory('$binaryStorageDir/$platform/jniLibs')
+      .listSync(recursive: true)
+      .forEach((cronet) {
+    if (cronet is File) {
+      Directory('$android/src/main/jniLibs/${basename(cronet.parent.path)}')
+          .createSync();
+      cronet.renameSync(
+          '$android/src/main/jniLibs/${basename(cronet.parent.path)}'
+          '/${basename(cronet.path)}');
+    }
+  });
+}
+
 /// Places downloaded binaries to proper location.
 void placeBinaries(String platform, String fileName) {
   final logger = Logger.standard();
   final ansi = Ansi(Ansi.terminalSupportsAnsi);
   logger.stdout('${ansi.yellow}Extracting Cronet for $platform${ansi.none}');
   Directory(binaryStorageDir).createSync(recursive: true);
   extract(fileName, binaryStorageDir);
+  if (mobilePlatforms.contains(platform)) {
+    placeMobileBinaries(platform, fileName);
+  }
   logger.stdout('Done! Cleaning up...');
 
   File(fileName).deleteSync();
@@ -238,6 +266,9 @@ Future<void> main(List<String> args) async {
     if (validPlatforms.contains('${Platform.operatingSystem}64')) {
       await downloadCronetBinaries('${Platform.operatingSystem}64');
     }
+    if (Directory('android').existsSync()) {
+      await downloadCronetBinaries('android');
+    }
   } else {
     await runner.run(args);
   }

lib/src/constants.dart

@@ -4,10 +4,12 @@
 
 import 'dart:io' show Platform;
 
-const validPlatforms = ['linux64', 'windows64', 'macos64'];
-const tag = 'binaries-v0.0.2';
+const desktopPlatforms = ['linux64', 'windows64', 'macos64'];
+const mobilePlatforms = ['android'];
+List<String> get validPlatforms => desktopPlatforms + mobilePlatforms;
+const tag = 'binaries-v0.0.4';
 const cronetBinaryUrl =
-    'https://github.com/google/cronet.dart/releases/download/$tag/';
+    'https://github.com/unsuitable001/cronet.dart/releases/download/$tag/';
 const cronetVersion = "86.0.4240.198";
 const wrapperVersion = "1";
 

lib/src/third_party/ffigen/find_resource.dart

@@ -60,5 +60,8 @@ bool isCronetAvailable(String platform) {
               .existsSync() &&
           File.fromUri(Directory.current.uri.resolve(getCronetName(platform)))
               .existsSync();
-  return cronetBinaries || inRoot;
+  final inAndroidDir = platform == 'android' &&
+      File.fromUri(findPackageRoot().resolve('android/libs/cronet_api.jar'))
+          .existsSync();
+  return cronetBinaries || inRoot || inAndroidDir;
 }

pubspec.yaml

@@ -3,7 +3,7 @@
 # BSD-style license that can be found in the LICENSE file.
 
 name: cronet
-version: 0.0.3
+version: 0.0.4
 homepage: https://github.com/google/cronet.dart
 description: Experimental Cronet dart bindings.
 

tool/update_tars.dart

@@ -6,10 +6,12 @@
 import 'dart:io';
 
 import 'package:cronet/src/constants.dart';
+import 'package:cronet/src/third_party/ffigen/find_resource.dart';
+import 'package:path/path.dart';
 
 void main() {
   Directory.current = Directory.current.uri.resolve('.dart_tool/cronet').path;
-  for (final platform in validPlatforms) {
+  for (final platform in desktopPlatforms) {
     if (File('$platform/${getCronetName(platform)}').existsSync()) {
       final result =
           Process.runSync('tar', ['-czvf', '$platform.tar.gz', platform]);
@@ -20,4 +22,29 @@ void main() {
           '${getCronetName(platform)} not found in .dart_tool/cronet/$platform');
     }
   }
+  // Make tarball for android releases.
+  final android =
+      '${findPackageRoot().toFilePath(windows: Platform.isWindows)}/android';
+  if (!Directory('$android/libs').existsSync()) return;
+  Directory('android/libs').createSync(recursive: true);
+  Directory('$android/libs/').listSync().forEach((jar) {
+    if (jar is File) {
+      print(jar);
+      jar.copySync('android/libs/${basename(jar.path)}');
+    }
+  });
+  Directory('android/jniLibs').createSync(recursive: true);
+  Directory('$android/src/main/jniLibs/')
+      .listSync(recursive: true)
+      .forEach((cronet) {
+    if (cronet is File) {
+      print(cronet);
+      Directory('android/jniLibs/${basename(cronet.parent.path)}').createSync();
+      cronet.copySync('android/jniLibs/${basename(cronet.parent.path)}'
+          '/${basename(cronet.path)}');
+    }
+  });
+  final result = Process.runSync('tar', ['-czvf', 'android.tar.gz', 'android']);
+  print(result.stdout);
+  print(result.stderr);
 }