Skip to content

Commit 785ae93

Browse files
committed
[gardening] Fix NNDB flag use for Flutter HHH build.
Our //build/config/BUILDCONFIG.gn isn't used for Flutter, so we must put the default version where the Flutter build can see it. Change-Id: I99afc99209b3721c48aa56ef413910d34df1bb8c Cq-Include-Trybots: luci.dart.try:flutter-engine-linux-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/120580 Reviewed-by: Teagan Strickland <sstrickl@google.com> Commit-Queue: Teagan Strickland <sstrickl@google.com>
1 parent 2a8ce5b commit 785ae93

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

BUILD.gn

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ import("build/config/gclient_args.gni")
66

77
targetting_fuchsia = target_os == "fuchsia"
88

9+
declare_args() {
10+
# Whether to use the NNBD fork of the SDK core libraries.
11+
# TODO(rnystrom): Remove this when the fork has been merged back in.
12+
use_nnbd = false
13+
}
14+
915
# This target will be built if no target is specified when invoking ninja.
1016
group("default") {
1117
if (targetting_fuchsia) {

build/config/BUILDCONFIG.gn

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,6 @@ declare_args() {
130130

131131
# Compile for Thread Sanitizer to find threading bugs.
132132
is_tsan = false
133-
134-
# Whether to use the NNBD fork of the SDK core libraries.
135-
# TODO(rnystrom): Remove this when the fork has been merged back in.
136-
use_nnbd = false
137133
}
138134

139135
# =============================================================================

utils/dartdevc/BUILD.gn

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,13 +207,8 @@ group("dartdevc_test") {
207207
":dartdevc_kernel_sdk",
208208
":dartdevc_sdk",
209209
":dartdevc_test_pkg",
210+
"../..:create_sdk",
210211
]
211-
212-
if (use_nnbd) {
213-
deps += [ "../../sdk_nnbd:create_sdk" ]
214-
} else {
215-
deps += [ "../../sdk:create_sdk" ]
216-
}
217212
}
218213

219214
# Builds everything needed to run dartdevc tests locally using test.dart without

0 commit comments

Comments
 (0)