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

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

Issue 1338483002: Enable nacl on 32-bit x86 linux GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nacl_x86
Patch Set: Created 5 years, 3 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 | build/toolchain/nacl/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 Chrome-feature-related build flags (see ui.gni for 5 # This file contains Chrome-feature-related build flags (see ui.gni for
6 # UI-related ones). These should theoretically be moved to the build files of 6 # UI-related ones). These should theoretically be moved to the build files of
7 # the features themselves. 7 # the features themselves.
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 to match the GYP configuration. Also, 10 # e.g. base, so they need to be global to match the GYP configuration. Also,
(...skipping 19 matching lines...) Expand all
30 # TODO(GYP): Get NaCl linking on other platforms. 30 # TODO(GYP): Get NaCl linking on other platforms.
31 # Also, see if we can always get rid of enable_nacl_untrusted and 31 # Also, see if we can always get rid of enable_nacl_untrusted and
32 # enable_pnacl and always build them if enable_nacl is true. 32 # enable_pnacl and always build them if enable_nacl is true.
33 # The "is_nacl" part of the condition is needed to ensure that 33 # The "is_nacl" part of the condition is needed to ensure that
34 # the untrusted code is built properly; arguably it should be 34 # the untrusted code is built properly; arguably it should be
35 # guarded by "is_nacl" directly rather than enable_nacl_untrusted, but 35 # guarded by "is_nacl" directly rather than enable_nacl_untrusted, but
36 # this will go away when Mac and Win are working and we can just use 36 # this will go away when Mac and Win are working and we can just use
37 # the commented out logic. 37 # the commented out logic.
38 # Eventually we want this to be: 38 # Eventually we want this to be:
39 # enable_nacl = !is_ios && !is_android 39 # enable_nacl = !is_ios && !is_android
40 enable_nacl = (is_linux && !is_chromeos && current_cpu == "x64") || is_nacl 40 enable_nacl = (is_linux && !is_chromeos) || is_nacl
41 enable_nacl_untrusted = enable_nacl 41 enable_nacl_untrusted = enable_nacl
42 enable_pnacl = enable_nacl_untrusted 42 enable_pnacl = enable_nacl_untrusted
43 43
44 # If debug_devtools is set to true, JavaScript files for DevTools are stored 44 # If debug_devtools is set to true, JavaScript files for DevTools are stored
45 # as is and loaded from disk. Otherwise, a concatenated file is stored in 45 # as is and loaded from disk. Otherwise, a concatenated file is stored in
46 # resources.pak. It is still possible to load JS files from disk by passing 46 # resources.pak. It is still possible to load JS files from disk by passing
47 # --debug-devtools cmdline switch. 47 # --debug-devtools cmdline switch.
48 debug_devtools = false 48 debug_devtools = false
49 49
50 # Enables WebRTC. 50 # Enables WebRTC.
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 # system). 205 # system).
206 # TODO(GYP) also require !embedded to enable. 206 # TODO(GYP) also require !embedded to enable.
207 use_gconf = is_linux && !is_chromeos 207 use_gconf = is_linux && !is_chromeos
208 208
209 # Whether to back up data before sync. 209 # Whether to back up data before sync.
210 enable_pre_sync_backup = is_win || is_mac || (is_linux && !is_chromeos) 210 enable_pre_sync_backup = is_win || is_mac || (is_linux && !is_chromeos)
211 211
212 # Enable WebVR support by default on Android 212 # Enable WebVR support by default on Android
213 # Still requires command line flag to access API 213 # Still requires command line flag to access API
214 enable_webvr = is_android 214 enable_webvr = is_android
OLDNEW
« no previous file with comments | « no previous file | build/toolchain/nacl/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698