Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Side by Side Diff: build/config/features.gni

Issue 1119613002: Fix building NaCl in Linux component GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rely on NaCl toolchains to turn off component build Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/test/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # This file contains UI-related build flags. It should theoretically be in the 5 # This file contains UI-related build flags. It should theoretically be in the
6 # src/ui directory and only things that depend on the ui module should get the 6 # src/ui directory and only things that depend on the ui module should get the
7 # definitions. 7 # definitions.
8 # 8 #
9 # However, today we have many "bad" dependencies on some of these flags from, 9 # However, today we have many "bad" dependencies on some of these flags from,
10 # e.g. base, so they need to be global. 10 # e.g. base, so they need to be global.
(...skipping 14 matching lines...) Expand all
25 # TODO(GYP): Get NaCl linking on other platforms. 25 # TODO(GYP): Get NaCl linking on other platforms.
26 # Also, see if we can always get rid of enable_nacl_untrusted and 26 # Also, see if we can always get rid of enable_nacl_untrusted and
27 # enable_pnacl and always build them if enable_nacl is true. 27 # enable_pnacl and always build them if enable_nacl is true.
28 # The "is_nacl" part of the condition is needed to ensure that 28 # The "is_nacl" part of the condition is needed to ensure that
29 # the untrusted code is built properly; arguably it should be 29 # the untrusted code is built properly; arguably it should be
30 # guarded by "is_nacl" directly rather than enable_nacl_untrusted, but 30 # guarded by "is_nacl" directly rather than enable_nacl_untrusted, but
31 # this will go away when Mac and Win are working and we can just use 31 # this will go away when Mac and Win are working and we can just use
32 # the commented out logic. 32 # the commented out logic.
33 # Eventually we want this to be: 33 # Eventually we want this to be:
34 # enable_nacl = !is_ios && !is_android 34 # enable_nacl = !is_ios && !is_android
35 enable_nacl = (is_linux && !is_chromeos && !is_component_build && 35 enable_nacl = (is_linux && !is_chromeos && current_cpu == "x64") || is_nacl
36 current_cpu == "x64") || is_nacl
37 enable_nacl_untrusted = enable_nacl 36 enable_nacl_untrusted = enable_nacl
38 enable_pnacl = enable_nacl_untrusted 37 enable_pnacl = enable_nacl_untrusted
39 38
40 # If debug_devtools is set to true, JavaScript files for DevTools are stored 39 # If debug_devtools is set to true, JavaScript files for DevTools are stored
41 # as is and loaded from disk. Otherwise, a concatenated file is stored in 40 # as is and loaded from disk. Otherwise, a concatenated file is stored in
42 # resources.pak. It is still possible to load JS files from disk by passing 41 # resources.pak. It is still possible to load JS files from disk by passing
43 # --debug-devtools cmdline switch. 42 # --debug-devtools cmdline switch.
44 debug_devtools = false 43 debug_devtools = false
45 44
46 # Enables WebRTC. 45 # Enables WebRTC.
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 # TODO(GYP) also require !embedded to enable. 181 # TODO(GYP) also require !embedded to enable.
183 use_gconf = is_linux && !is_chromeos 182 use_gconf = is_linux && !is_chromeos
184 183
185 # Hangout services is an extension that adds extra features to Hangouts. 184 # Hangout services is an extension that adds extra features to Hangouts.
186 # For official GYP builds, this flag is set, it will likely need to be 185 # For official GYP builds, this flag is set, it will likely need to be
187 # parameterized in the future for a similar use. 186 # parameterized in the future for a similar use.
188 enable_hangout_services_extension = false 187 enable_hangout_services_extension = false
189 188
190 # Whether to back up data before sync. 189 # Whether to back up data before sync.
191 enable_pre_sync_backup = is_win || is_mac || (is_linux && !is_chromeos) 190 enable_pre_sync_backup = is_win || is_mac || (is_linux && !is_chromeos)
OLDNEW
« no previous file with comments | « no previous file | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698