fix: use OS.executableFileName rather than hardcoding the extension

Author: knopp

native_toolchain_rust/lib/src/android_environment.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:collection/collection.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:native_toolchain_rust/rustup.dart';
 import 'package:native_toolchain_rust/src/android_linker_wrapper.dart';
 import 'package:path/path.dart' as path;
@@ -86,8 +87,6 @@ class AndroidEnvironment {
   Future<Map<String, String>> buildEnvironment() async {
     final toolchainPath = ndkInfo.toolchainPath;
 
-    final exe = Platform.isWindows ? '.exe' : '';
-
     final arKey = 'AR_${target.triple}';
     final arValue = ['${target.triple}-ar', 'llvm-ar', 'llvm-ar.exe']
         .map((e) => path.join(toolchainPath, e))
@@ -99,12 +98,18 @@ class AndroidEnvironment {
     final targetArg = '--target=${target.triple}$minSdkVersion';
 
     final ccKey = 'CC_${target.triple}';
-    final ccValue = path.join(toolchainPath, 'clang$exe');
+    final ccValue = path.join(
+      toolchainPath,
+      OS.current.executableFileName('clang'),
+    );
     final cfFlagsKey = 'CFLAGS_${target.triple}';
     final cFlagsValue = targetArg;
 
     final cxxKey = 'CXX_${target.triple}';
-    final cxxValue = path.join(toolchainPath, 'clang++$exe');
+    final cxxValue = path.join(
+      toolchainPath,
+      OS.current.executableFileName('clang++'),
+    );
     final cxxFlagsKey = 'CXXFLAGS_${target.triple}';
     final cxxFlagsValue = targetArg;
 
@@ -113,7 +118,10 @@ class AndroidEnvironment {
             .toUpperCase();
 
     final ranlibKey = 'RANLIB_${target.triple}';
-    final ranlibValue = path.join(toolchainPath, 'llvm-ranlib$exe');
+    final ranlibValue = path.join(
+      toolchainPath,
+      OS.current.executableFileName('llvm-ranlib'),
+    );
 
     final rustFlagsKey = 'CARGO_ENCODED_RUSTFLAGS';
     final rustFlagsValue = _libGccWorkaround(targetTempDir, ndkInfo.ndkVersion);

native_toolchain_rust/lib/src/android_linker_wrapper.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:native_toolchain_rust/rustup.dart';
 import 'package:native_toolchain_rust_common/native_toolchain_rust_common.dart';
 import 'package:path/path.dart' as path;
@@ -50,6 +51,11 @@ fn main() {
 }
 ''';
 
+/// This class is responsible for creating and building the linker wrapper.
+/// This avoid using NDK wrapper scripts, which on windows cause problems when invoked
+/// from rustc due to wrong CMD argument escaping.
+///
+/// https://github.com/android/ndk/issues/1856
 class AndroidLinkerWrapper {
   final String tempDir;
   final RustupToolchain toolchain;
@@ -61,9 +67,8 @@ class AndroidLinkerWrapper {
 
   Future<String> linkerWrapperPath() async {
     String wrapperRoot = path.join(tempDir, 'linker_wrapper_1.0');
-    final exe = Platform.isWindows ? '.exe' : '';
-    String executablePath =
-        path.join(wrapperRoot, 'target', 'debug', 'linker_wrapper$exe');
+    String executablePath = path.join(wrapperRoot, 'target', 'debug',
+        OS.current.executableFileName('linker_wrapper'));
     if (!File(executablePath).existsSync()) {
       Directory(wrapperRoot).createSync(recursive: true);
       File(path.join(wrapperRoot, 'Cargo.toml')).writeAsStringSync(_cargoToml);