Skip to content

Commit

Permalink
[pkg] native_assets_builder build mode
Browse files Browse the repository at this point in the history
Manual roll of: dart-lang/native#62

Bug: #50565
Change-Id: Ie5b9ef9e9cdfbb9c19eac299f9f0294496b77520
Cq-Include-Trybots: luci.dart.try:pkg-win-release-try,pkg-mac-release-arm64-try,pkg-mac-release-try,pkg-linux-release-try,pkg-linux-debug-try
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/308040
Reviewed-by: Hossein Yousefi <yousefi@google.com>
Commit-Queue: Daco Harkes <dacoharkes@google.com>
  • Loading branch information
dcharkes authored and Commit Queue committed Jun 8, 2023
1 parent 0b62bb6 commit 984ea72
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ vars = {
"matcher_rev": "7e1011772566a8d1817c725a71f091e2791721c8",
"mime_rev": "24448401f621b9e154d165c900a3c8decd8a23f4",
"mockito_rev": "cca4858ad0f1e3930ebdcc6faf4a918616cca48c",
"native_rev": "973f3ed93dace19864903e17e771a44a2d9955b7",
"native_rev": "78cf286e15aec57b51a1bbbbcaada5216ddc626a",
"package_config_rev": "203de2022af26b3ab2bcec18cc49614d9e502897",
"path_rev": "f8d15c2775835fd61ea5e06bb0ab99232f5ec446",
"pool_rev": "a10a0f918802f7b3856cb1f4c78f9073f28a0dd8",
Expand Down
1 change: 1 addition & 0 deletions pkg/dartdev/lib/src/commands/build.dart
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ class BuildCommand extends DartdevCommand {
workingDirectory: workingDirectory,
target: target,
linkModePreference: LinkModePreference.dynamic,
buildMode: BuildMode.release,
includeParentEnvironment: true,
);
final staticAssets = nativeAssets.whereLinkMode(LinkMode.static);
Expand Down
2 changes: 2 additions & 0 deletions pkg/dartdev/lib/src/native_assets.dart
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ Future<List<Asset>?> compileNativeAssetsJit() async {
target: Target.current,
// When running in JIT mode, only dynamic libraries are supported.
linkModePreference: LinkModePreference.dynamic,
// Dart has no concept of release vs debug, default to release.
buildMode: BuildMode.release,
includeParentEnvironment: true,
);
return assets;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class NativeAssetsBuildRunner {
required LinkModePreference linkModePreference,
required Target target,
required Uri workingDirectory,
required BuildMode buildMode,
CCompilerConfig? cCompilerConfig,
IOSSdk? targetIOSSdk,
int? targetAndroidNdkApi,
Expand Down Expand Up @@ -66,6 +67,7 @@ class NativeAssetsBuildRunner {
packageName: package.name,
packageRoot: packageLayout.packageRoot(package.name),
target: target,
buildMode: buildMode,
linkMode: linkModePreference,
buildParentDir: packageLayout.dartToolNativeAssetsBuilder,
dependencyMetadata: dependencyMetadata,
Expand Down Expand Up @@ -169,6 +171,7 @@ class NativeAssetsBuildRunner {
required Target target,
IOSSdk? targetIOSSdk,
int? targetAndroidNdkApi,
required BuildMode buildMode,
required LinkModePreference linkMode,
required Uri buildParentDir,
CCompilerConfig? cCompilerConfig,
Expand All @@ -177,6 +180,7 @@ class NativeAssetsBuildRunner {
final buildDirName = BuildConfig.checksum(
packageRoot: packageRoot,
target: target,
buildMode: buildMode,
linkModePreference: linkMode,
targetIOSSdk: targetIOSSdk,
cCompiler: cCompilerConfig,
Expand All @@ -193,6 +197,7 @@ class NativeAssetsBuildRunner {
outDir: outDirUri,
packageRoot: packageRoot,
target: target,
buildMode: buildMode,
linkModePreference: linkMode,
targetIOSSdk: targetIOSSdk,
cCompiler: cCompilerConfig,
Expand Down
1 change: 1 addition & 0 deletions pkg/native_assets_builder/test/build_runner/helpers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ Future<List<Asset>> build(
logger: logger,
dartExecutable: dartExecutable,
).build(
buildMode: BuildMode.release,
linkModePreference: linkModePreference,
target: Target.current,
workingDirectory: packageUri,
Expand Down

0 comments on commit 984ea72

Please sign in to comment.