Skip to content

fix: resolve NDK path discovery on Windows #3

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

Open
AttalliAyoub wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: resolve NDK path discovery on Windows #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 0.1.2

* Fixed NDK path resolution on Windows by using `USERPROFILE` and normalizing path separators.

## 0.1.1

* Updated `native_toolchain_c` to `0.18.0`.
Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ packages:
path: ".."
relative: true
source: path
version: "0.1.0"
version: "0.1.1"
archive:
dependency: transitive
description:
Expand Down
11 changes: 7 additions & 4 deletions lib/src/locate_ndk.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,10 +378,13 @@ class NDKLocator {

/// Expands a path template with environment variables and glob patterns.
static List<FileSystemEntity> expandPath(String pathTemplate) {
final path = pathTemplate.replaceAll(
'\$HOME',
Platform.environment['HOME']!,
);
// Use platform-dependent environment variables for the user's home directory
final homeDir = Platform.isWindows
? Platform.environment['USERPROFILE'] ?? ''
: Platform.environment['HOME'] ?? '';
// Glob requires forward slashes, and USERPROFILE uses backslashes
final normalizedHomeDir = homeDir.replaceAll('\\', '/');
final path = pathTemplate.replaceAll('\$HOME', normalizedHomeDir);
final glob = Glob(path);
final matches = glob.listSync();
return matches;
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: android_libcpp_shared
description: "Dart / flutter package for Android to add the libc++_shared.so STL C++ shared runtime library to your app"
version: 0.1.1
version: 0.1.2
homepage: https://zeyus.com/
repository: https://github.com/NexusDynamic/android_libcpp_shared
issue_tracker: https://github.com/NexusDynamic/android_libcpp_shared/issues
Expand Down