Add resource identifiers for linking

.github/workflows/native.yaml

@@ -150,6 +150,14 @@ jobs:
         working-directory: pkgs/${{ matrix.package }}/example/build/native_add_app/bin/native_add_app/
         if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
 
+      - run: dart --enable-experiment=native-assets build bin/drop_dylib_link.dart
+        working-directory: pkgs/${{ matrix.package }}/test_data/drop_dylib_link/
+        if: ${{ matrix.package == 'native_assets_builder' && matrix.sdk == 'dev' && !matrix.breaking-change }}
+
+      - run: ./drop_dylib_link.exe
+        working-directory: pkgs/${{ matrix.package }}/test_data/drop_dylib_link/bin/drop_dylib_link/
+        if: ${{ matrix.package == 'native_assets_builder' && matrix.sdk == 'dev' && !matrix.breaking-change }}
+
       - run: dart --enable-experiment=native-assets test
         working-directory: pkgs/${{ matrix.package }}/example/build/use_dart_api/
         if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}

pkgs/native_assets_builder/pubspec.yaml

@@ -4,18 +4,18 @@ description: >-
 version: 0.7.0
 repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_builder
 
-# publish_to: none
+publish_to: none
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
 
 dependencies:
   collection: ^1.18.0
   graphs: ^2.3.1
   logging: ^1.2.0
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #  path: ../native_assets_cli/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+    path: ../native_assets_cli/
   package_config: ^2.1.0
   yaml: ^3.1.2
   yaml_edit: ^2.1.0

pkgs/native_assets_builder/test_data/add_asset_link/pubspec.yaml

@@ -10,12 +10,12 @@ environment:
 dependencies:
   logging: ^1.1.1
   meta: ^1.12.0
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #   path: ../../../native_assets_cli/
-  native_toolchain_c: ^0.4.2
-  # native_toolchain_c:
-  #   path: ../../../native_toolchain_c/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+     path: ../../../native_assets_cli/
+  # native_toolchain_c: ^0.4.2
+  native_toolchain_c:
+    path: ../../../native_toolchain_c/
 
 dev_dependencies:
   lints: ^3.0.0

pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml

@@ -12,9 +12,9 @@ dependencies:
   complex_link_helper:
     path: ../complex_link_helper/
   logging: ^1.1.1
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #   path: ../../../native_assets_cli/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+     path: ../../../native_assets_cli/
 
 dev_dependencies:
   lints: ^3.0.0

pkgs/native_assets_builder/test_data/complex_link_helper/pubspec.yaml

@@ -10,9 +10,9 @@ environment:
 dependencies:
   cli_config: ^0.2.0
   logging: ^1.1.1
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #   path: ../../../native_assets_cli/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+     path: ../../../native_assets_cli/
 
 dev_dependencies:
   lints: ^3.0.0

pkgs/native_assets_builder/test_data/cyclic_package_1/pubspec.yaml

@@ -10,9 +10,9 @@ environment:
 dependencies:
   cyclic_package_2:
     path: ../cyclic_package_2
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #  path: ../../../native_assets_cli/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+    path: ../../../native_assets_cli/
   yaml: ^3.1.1
   yaml_edit: ^2.1.0
 

pkgs/native_assets_builder/test_data/cyclic_package_2/pubspec.yaml

@@ -10,9 +10,9 @@ environment:
 dependencies:
   cyclic_package_1:
     path: ../cyclic_package_1
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #  path: ../../../native_assets_cli/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+    path: ../../../native_assets_cli/
   yaml: ^3.1.1
   yaml_edit: ^2.1.0
 

pkgs/native_assets_builder/test_data/drop_dylib_link/README.md

@@ -1 +1,2 @@
-This sample builds a native library for adding and multiplying, but then only keeps the one for adding in the linking step.
+This sample builds a native library for adding and multiplying, but then only
+keeps the one for adding in the linking step.

pkgs/native_assets_builder/test_data/drop_dylib_link/bin/drop_dylib_link.dart

@@ -4,12 +4,12 @@
 
 import 'package:drop_dylib_link/drop_dylib_link.dart';
 
+const debug = false;
+
 void main(List<String> arguments) {
-  if (arguments.first == 'add') {
+  if (!debug) {
     print('Hello world: ${MyMath.add(3, 4)}!');
-  } else if (arguments.first == 'multiply') {
+  } else if (debug) {
     print('Hello world: ${MyMath.multiply(3, 4)}!');
-  } else {
-    throw ArgumentError('Must pass either "add" or "multiply"');
   }
 }

pkgs/native_assets_builder/test_data/drop_dylib_link/hook/link.dart

@@ -6,13 +6,14 @@ import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> arguments) async {
   await link(arguments, (config, output) async {
-    print('''
-Received ${config.assets.length} assets: ${config.assets.map((e) => e.id)}.
-''');
-    output.addAssets(config.assets.where((asset) => asset.id.endsWith('add')));
-    print('''
-Keeping only ${output.assets.map((e) => e.id)}.
-''');
-    output.addDependency(config.packageRoot.resolve('hook/link.dart'));
+    output.addAssets(config.assets.where((asset) =>
+        config.treeshakingInformation?.any(
+          (element) => asset.id.contains(element.metadata.toString()),
+        ) ??
+        true));
+    output.addDependencies([
+      config.packageRoot.resolve('hook/link.dart'),
+      config.packageRoot.resolve('lib/'),
+    ]);
   });
 }

pkgs/native_assets_builder/test_data/drop_dylib_link/pubspec.yaml

@@ -10,12 +10,12 @@ environment:
 dependencies:
   logging: ^1.1.1
   meta: ^1.12.0
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #   path: ../../../native_assets_cli/
-  native_toolchain_c: ^0.4.2
-  # native_toolchain_c:
-  #   path: ../../../native_toolchain_c/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+     path: ../../../native_assets_cli/
+  # native_toolchain_c: ^0.4.2
+  native_toolchain_c:
+    path: ../../../native_toolchain_c/
 
 dev_dependencies:
   lints: ^3.0.0

pkgs/native_assets_builder/test_data/native_add/pubspec.yaml

@@ -9,12 +9,12 @@ environment:
 
 dependencies:
   logging: ^1.1.1
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #  path: ../../../native_assets_cli/
-  native_toolchain_c: ^0.4.2
-  # native_toolchain_c:
-  #   path: ../../../native_toolchain_c/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+    path: ../../../native_assets_cli/
+  # native_toolchain_c: ^0.4.2
+  native_toolchain_c:
+    path: ../../../native_toolchain_c/
 
 dev_dependencies:
   ffigen: ^8.0.2

pkgs/native_assets_builder/test_data/native_add_add_source/pubspec.yaml

@@ -9,12 +9,12 @@ environment:
 
 dependencies:
   logging: ^1.1.1
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #  path: ../../../native_assets_cli/
-  native_toolchain_c: ^0.4.2
-  # native_toolchain_c:
-  #   path: ../../../native_toolchain_c/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+    path: ../../../native_assets_cli/
+  # native_toolchain_c: ^0.4.2
+  native_toolchain_c:
+    path: ../../../native_toolchain_c/
 
 dev_dependencies:
   ffigen: ^8.0.2

pkgs/native_assets_builder/test_data/native_subtract/pubspec.yaml

@@ -9,12 +9,12 @@ environment:
 
 dependencies:
   logging: ^1.1.1
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #  path: ../../../native_assets_cli/
-  native_toolchain_c: ^0.4.2
-  # native_toolchain_c:
-  #   path: ../../../native_toolchain_c/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+    path: ../../../native_assets_cli/
+  # native_toolchain_c: ^0.4.2
+  native_toolchain_c:
+    path: ../../../native_toolchain_c/
 
 dev_dependencies:
   ffigen: ^8.0.2

pkgs/native_assets_builder/test_data/no_asset_for_link/pubspec.yaml

@@ -10,9 +10,9 @@ environment:
 dependencies:
   logging: ^1.1.1
   meta: ^1.12.0
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #   path: ../../../native_assets_cli/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+     path: ../../../native_assets_cli/
 
 dev_dependencies:
   lints: ^3.0.0

pkgs/native_assets_builder/test_data/package_reading_metadata/pubspec.yaml

@@ -8,9 +8,9 @@ environment:
   sdk: '>=3.3.0 <4.0.0'
 
 dependencies:
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #  path: ../../../native_assets_cli/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+    path: ../../../native_assets_cli/
   package_with_metadata:
     path: ../package_with_metadata/
   yaml: ^3.1.1

pkgs/native_assets_builder/test_data/package_with_metadata/pubspec.yaml

@@ -8,9 +8,9 @@ environment:
   sdk: '>=3.3.0 <4.0.0'
 
 dependencies:
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #  path: ../../../native_assets_cli/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+    path: ../../../native_assets_cli/
   yaml: ^3.1.1
   yaml_edit: ^2.1.0
 

pkgs/native_assets_builder/test_data/simple_link/.gitignore

@@ -0,0 +1,4 @@
+# https://dart.dev/guides/libraries/private-files
+# Created by `dart pub`
+.dart_tool/
+bin/simple_link/

pkgs/native_assets_builder/test_data/simple_link/pubspec.yaml

@@ -10,9 +10,9 @@ environment:
 dependencies:
   cli_config: ^0.2.0
   logging: ^1.1.1
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #   path: ../../../native_assets_cli/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+     path: ../../../native_assets_cli/
 
 dev_dependencies:
   lints: ^3.0.0

pkgs/native_assets_builder/test_data/wrong_build_output/pubspec.yaml

@@ -8,9 +8,9 @@ environment:
   sdk: '>=3.3.0 <4.0.0'
 
 dependencies:
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #  path: ../../../native_assets_cli/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+    path: ../../../native_assets_cli/
   yaml: ^3.1.1
   yaml_edit: ^2.1.0
 

pkgs/native_assets_builder/test_data/wrong_build_output_2/pubspec.yaml

@@ -8,9 +8,9 @@ environment:
   sdk: '>=3.3.0 <4.0.0'
 
 dependencies:
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #  path: ../../../native_assets_cli/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+    path: ../../../native_assets_cli/
   yaml: ^3.1.1
   yaml_edit: ^2.1.0
 

pkgs/native_assets_builder/test_data/wrong_build_output_3/pubspec.yaml

@@ -5,12 +5,12 @@ version: 0.1.0
 publish_to: none
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
 
 dependencies:
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #  path: ../../../native_assets_cli/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+    path: ../../../native_assets_cli/
   yaml: ^3.1.1
   yaml_edit: ^2.1.0
 

pkgs/native_assets_builder/test_data/wrong_namespace_asset/pubspec.yaml

@@ -5,12 +5,12 @@ version: 0.1.0
 publish_to: none
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
 
 dependencies:
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #  path: ../../../native_assets_cli/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+    path: ../../../native_assets_cli/
   yaml: ^3.1.1
   yaml_edit: ^2.1.0
 

pkgs/native_assets_cli/example/build/local_asset/pubspec.yaml

@@ -10,9 +10,9 @@ environment:
 
 dependencies:
   logging: ^1.1.1
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #   path: ../../../../native_assets_cli/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+    path: ../../../../native_assets_cli/
 
 dev_dependencies:
   ffigen: ^8.0.2

pkgs/native_assets_cli/example/build/native_add_library/pubspec.yaml

@@ -6,16 +6,16 @@ version: 0.1.0
 repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_cli/example/build/native_add_library
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: ">=3.3.0 <4.0.0"
 
 dependencies:
   logging: ^1.1.1
-  native_assets_cli: ^0.6.0
-  # native_assets_cli:
-  #   path: ../../../../native_assets_cli/
-  native_toolchain_c: ^0.4.2
-  # native_toolchain_c:
-  #   path: ../../../../native_toolchain_c/
+  # native_assets_cli: ^0.6.0
+  native_assets_cli:
+    path: ../../../../native_assets_cli/
+  # native_toolchain_c: ^0.4.2
+  native_toolchain_c:
+    path: ../../../../native_toolchain_c/
 
 dev_dependencies:
   ffigen: ^8.0.2