Skip to content

Commit 06e2d5a

Browse files
authored
Eliminate is_nacl from build config (flutter#127)
Given our lack of use of NaCL and its deprecation, eliminating it seems like generally not a bad idea.
1 parent dc349db commit 06e2d5a

File tree

3 files changed

+5
-32
lines changed

3 files changed

+5
-32
lines changed

build/config/BUILD.gn

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ config("debug") {
8787
"WTF_USE_DYNAMIC_ANNOTATIONS=1",
8888
]
8989

90-
if (is_nacl) {
91-
defines += [ "DYNAMIC_ANNOTATIONS_PREFIX=NACL_" ]
92-
}
93-
9490
if (is_win) {
9591
if (disable_iterator_debugging) {
9692
# Iterator debugging is enabled by the compiler on debug builds, and we
@@ -119,11 +115,7 @@ config("release") {
119115
]
120116
} else {
121117
defines += [ "NVALGRIND" ]
122-
if (!is_nacl) {
123-
# NaCl always enables dynamic annotations. Currently this value is set to
124-
# 1 for all .nexes.
125-
defines += [ "DYNAMIC_ANNOTATIONS_ENABLED=0" ]
126-
}
118+
defines += [ "DYNAMIC_ANNOTATIONS_ENABLED=0" ]
127119
}
128120
}
129121

build/config/BUILDCONFIG.gn

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ if (current_os == "win") {
188188
is_ios = false
189189
is_linux = false
190190
is_mac = false
191-
is_nacl = false
192191
is_posix = false
193192
is_win = true
194193
} else if (current_os == "mac") {
@@ -200,7 +199,6 @@ if (current_os == "win") {
200199
is_ios = false
201200
is_linux = false
202201
is_mac = true
203-
is_nacl = false
204202
is_posix = true
205203
is_win = false
206204
} else if (current_os == "android") {
@@ -212,7 +210,6 @@ if (current_os == "win") {
212210
is_ios = false
213211
is_linux = false
214212
is_mac = false
215-
is_nacl = false
216213
is_posix = true
217214
is_win = false
218215
} else if (current_os == "chromeos") {
@@ -224,7 +221,6 @@ if (current_os == "win") {
224221
is_ios = false
225222
is_linux = true
226223
is_mac = false
227-
is_nacl = false
228224
is_posix = true
229225
is_win = false
230226
} else if (current_os == "nacl") {
@@ -239,7 +235,6 @@ if (current_os == "win") {
239235
is_ios = false
240236
is_linux = false
241237
is_mac = false
242-
is_nacl = true
243238
is_posix = true
244239
is_win = false
245240
} else if (current_os == "ios") {
@@ -251,7 +246,6 @@ if (current_os == "win") {
251246
is_ios = true
252247
is_linux = false
253248
is_mac = false
254-
is_nacl = false
255249
is_posix = true
256250
is_win = false
257251
} else if (current_os == "linux") {
@@ -263,7 +257,6 @@ if (current_os == "win") {
263257
is_ios = false
264258
is_linux = true
265259
is_mac = false
266-
is_nacl = false
267260
is_posix = true
268261
is_win = false
269262
} else if (current_os == "fuchsia") {
@@ -274,7 +267,6 @@ if (current_os == "win") {
274267
is_ios = false
275268
is_linux = true
276269
is_mac = false
277-
is_nacl = false
278270
is_posix = true
279271
is_win = false
280272
}
@@ -625,12 +617,6 @@ if (is_win) {
625617
} else {
626618
set_default_toolchain("//build/toolchain/mac:ios_clang_arm")
627619
}
628-
} else if (is_nacl) {
629-
# TODO(GYP): This will need to change when we get NaCl working
630-
# on multiple platforms, but this whole block of code (how we define
631-
# host_toolchain) needs to be reworked regardless to key off of host_os
632-
# and host_cpu rather than the is_* variables.
633-
host_toolchain = "//build/toolchain/linux:clang_x64"
634620
}
635621

636622
# ==============================================================================

build/config/compiler/BUILD.gn

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -624,15 +624,10 @@ if (is_win) {
624624
]
625625

626626
if (is_mac || is_ios) {
627-
# TODO(abarth): Re-enable once https://github.com/domokit/mojo/issues/728
628-
# is fixed.
629-
# default_warning_flags += [ "-Wnewline-eof" ]
630-
if (!is_nacl) {
631-
# When compiling Objective-C, warns if a method is used whose
632-
# availability is newer than the deployment target. This is not
633-
# required when compiling Chrome for iOS.
634-
default_warning_flags += [ "-Wunguarded-availability" ]
635-
}
627+
# When compiling Objective-C, warns if a method is used whose
628+
# availability is newer than the deployment target. This is not
629+
# required when compiling Chrome for iOS.
630+
default_warning_flags += [ "-Wunguarded-availability" ]
636631
}
637632
}
638633

0 commit comments

Comments
 (0)