Skip to content

Commit 74c5aa3

Browse files
a-sivaCommit Queue
authored andcommitted
Revert ""[SDK/VM] - Rename dart_precompiled_runtime to dartaotruntime, ensures we have a uniform name for the executable between the build directories and the SDK directory""
This reverts commit f81a402. Reason for revert: golem benchmarks are failing to run TEST=ci Original change's description: > "[SDK/VM] - Rename dart_precompiled_runtime to dartaotruntime, ensures we have a uniform name for the executable between the build directories and the SDK directory" > > Fixed golem breakage by temporarily copying dartaotruntime to dart_precompiled_runtime > > This reverts commit 75e6a74. > > TEST=ci > > Original change's description: > > Revert "[SDK/VM] - Rename dart_precompiled_runtime to dartaotruntime, ensures we have a uniform name for the executable between the build directories and the SDK directory" > > > > This reverts commit 1b331d0. > > > > Reason for revert: golem builds are failing > > > > Original change's description: > > > [SDK/VM] - Rename dart_precompiled_runtime to dartaotruntime, ensures we have a uniform name for the executable between the build directories and the SDK directory > > > > > > TEST=ci > > > > > Change-Id: Id0f383eabb496c06c0acebc639c8e3b056ba82d0 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/393781 > Commit-Queue: Siva Annamalai <[email protected]> > Reviewed-by: Ryan Macnak <[email protected]> Change-Id: Iec494940412aa31dbefdc5280e35ae99e8cecb26 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/393764 Reviewed-by: Siva Annamalai <[email protected]> Reviewed-by: Liam Appelbe <[email protected]> Bot-Commit: Rubber Stamper <[email protected]> Commit-Queue: Siva Annamalai <[email protected]>
1 parent f81a402 commit 74c5aa3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+150
-220
lines changed

BUILD.gn

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ group("run_ffi_unit_tests") {
8686
group("runtime_precompiled") {
8787
import("runtime/runtime_args.gni")
8888
deps = [
89-
"runtime/bin:dartaotruntime",
89+
"runtime/bin:dart_precompiled_runtime",
9090
"runtime/bin:gen_snapshot",
9191
"runtime/bin:gen_snapshot($host_toolchain)",
9292
"runtime/bin:process_test",
@@ -110,15 +110,7 @@ group("create_platform_sdk") {
110110
}
111111

112112
group("dart2js") {
113-
import("runtime/runtime_args.gni")
114-
if (dart_target_arch != "ia32" && dart_target_arch != "x86") {
115-
deps = [
116-
":runtime_precompiled",
117-
"utils/compiler:dart2js_sdk_aot",
118-
]
119-
} else {
120-
deps = [ "utils/compiler:dart2js" ]
121-
}
113+
deps = [ "utils/compiler:dart2js" ]
122114
}
123115

124116
group("dart2wasm_platform") {
@@ -156,19 +148,7 @@ group("dartanalyzer") {
156148
}
157149

158150
group("ddc") {
159-
import("runtime/runtime_args.gni")
160-
if (dart_target_arch != "ia32" && dart_target_arch != "x86") {
161-
deps = [
162-
":runtime_precompiled",
163-
"utils/bazel:kernel_worker_aot",
164-
"utils/ddc:dartdevc_aot",
165-
]
166-
} else {
167-
deps = [
168-
"utils/bazel:kernel_worker",
169-
"utils/ddc:dartdevc",
170-
]
171-
}
151+
deps = [ "utils/ddc:dartdevc" ]
172152
}
173153

174154
group("analysis_server") {
@@ -387,7 +367,7 @@ if (is_fuchsia) {
387367

388368
test_binaries = [
389369
"dart",
390-
"dartaotruntime",
370+
"dart_precompiled_runtime",
391371
"run_vm_tests",
392372
]
393373

benchmarks/NativeCall/native/native_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <string.h>
88

99
// TODO(dartbug.com/40579): This requires static linking to either link
10-
// dart.exe or dartaotruntime.exe on Windows.
10+
// dart.exe or dart_precompiled_runtime.exe on Windows.
1111
// The sample currently fails on Windows in AOT mode.
1212
#include "include/dart_api.h"
1313

docs/Kernel-developer-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Run end-to-end tests using dartk + VM:
2828

2929
Optionally (this is slow) run end-to-end tests using AOT:
3030
```
31-
./tools/build.py runtime_precompiled
31+
./tools/build.py dart_precompiled_runtime
3232
./tools/test.py -cdartkp -rdart_precompiled language co19
3333
```
3434

pkg/dart2wasm/tool/compile_benchmark

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ BIN_DIR="$OUT_DIR/$DART_CONFIGURATION"
3535

3636
BINARYEN="$BIN_DIR/wasm-opt"
3737
DART="$BIN_DIR/dart"
38-
DART_AOT_RUNTIME="$BIN_DIR/dartaotruntime"
38+
DART_AOT_RUNTIME="$BIN_DIR/dart_precompiled_runtime"
3939
LIBRARIES_JSON_ARG="--libraries-spec=$SDK_DIR/sdk/lib/libraries.json"
4040

4141
function find_flags {

pkg/dartdev/lib/src/sdk.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ class Sdk {
5454
? path.absolute(
5555
sdkPath,
5656
Platform.isWindows
57-
? 'dartaotruntime_product.exe'
58-
: 'dartaotruntime_product',
57+
? 'dart_precompiled_runtime_product.exe'
58+
: 'dart_precompiled_runtime_product',
5959
)
6060
: path.absolute(
6161
sdkPath,

pkg/dev_compiler/test/worker/worker_test.dart

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,17 @@ void main() {
2525
var dartAotRuntime = p.absolute(
2626
sdkPath,
2727
Platform.isWindows
28-
? 'dartaotruntime_product.exe'
29-
: 'dartaotruntime_product');
30-
var snapshotName = _resolvePath('gen/dartdevc_aot_product.dart.snapshot');
28+
? 'dart_precompiled_runtime_product.exe'
29+
: 'dart_precompiled_runtime_product');
3130
if (!File(dartAotRuntime).existsSync()) {
3231
dartAotRuntime = p.absolute(
3332
sdkPath,
3433
Platform.isWindows
35-
? 'dartaotruntime_product.exe'
36-
: 'dartaotruntime_product');
37-
snapshotName = _resolvePath('gen/dartdevc_aot.dart.snapshot');
34+
? 'dart_precompiled_runtime.exe'
35+
: 'dart_precompiled_runtime');
3836
}
3937
final executableArgs = <String>[
40-
snapshotName,
38+
_resolvePath('gen/dartdevc_aot.dart.snapshot'),
4139
'--sound-null-safety',
4240
'--dart-sdk-summary',
4341
_resolvePath('ddc_outline.dill'),

pkg/dynamic_modules/test/runner/util.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,9 @@ Uri genSnapshotBin =
8686
buildRootUri.resolve(useProduct ? 'gen_snapshot_product' : 'gen_snapshot');
8787
Uri dart2bytecodeSnapshot =
8888
buildRootUri.resolve('gen/dart2bytecode.dart.snapshot');
89-
Uri aotRuntimeBin = buildRootUri
90-
.resolve(useProduct ? 'dartaotruntime_product' : 'dartaotruntime');
89+
Uri aotRuntimeBin = buildRootUri.resolve(useProduct
90+
? 'dart_precompiled_runtime_product'
91+
: 'dart_precompiled_runtime');
9192
Uri vmPlatformDill = buildRootUri.resolve('vm_platform_strong.dill');
9293

9394
// Encodes test results in the format expected by Dart's CI infrastructure.

pkg/front_end/lib/src/linux_and_intel_specific_perf.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ int _perfPid = -1;
4141
/// You might also want the dartaotruntime to include debug symbols:
4242
///
4343
/// ```
44-
/// cp out/ReleaseX64/dartaotruntime_product \
44+
/// cp out/ReleaseX64/dart_precompiled_runtime_product \
4545
/// out/ReleaseX64/dart-sdk/bin/dartaotruntime
4646
/// ```
4747
///

pkg/smith/lib/configuration.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ class Configuration {
251251
.pathSegments
252252
.lastWhere((e) => e.isNotEmpty);
253253
final executableNoExtension = executableName.split('.').first;
254-
if (executableNoExtension == 'dartaotruntime') {
254+
if (executableNoExtension == 'dart_precompiled_runtime') {
255255
runtime = Runtime.dartPrecompiled;
256256
} else if (executableNoExtension == 'dart') {
257257
runtime = Runtime.vm;

pkg/test_runner/lib/src/build_configurations.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ List<String> _selectBuildTargets(Configuration inner) {
8080
final compiler = inner.compiler;
8181
const targetsForCompilers = {
8282
Compiler.dartk: ['runtime'],
83-
Compiler.dartkp: ['runtime', 'runtime_precompiled'],
83+
Compiler.dartkp: ['runtime', 'dart_precompiled_runtime'],
8484
Compiler.appJitk: ['runtime'],
8585
Compiler.fasta: ['create_sdk', 'ddc_stable_test', 'kernel_platform_files'],
8686
Compiler.ddc: ['ddc_stable_test'],

0 commit comments

Comments
 (0)