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

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

Issue 1417823006: Build NaCl in the CrOS GN builds and make sure "all" works (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and make sure "all" works also (fix remoting) Created 5 years, 1 month 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 | ppapi/native_client/src/untrusted/pnacl_support_extension/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 21 matching lines...) Expand all
32 # TODO(GYP): Get NaCl linking on other platforms. 32 # TODO(GYP): Get NaCl linking on other platforms.
33 # Also, see if we can always get rid of enable_nacl_untrusted and 33 # Also, see if we can always get rid of enable_nacl_untrusted and
34 # enable_pnacl and always build them if enable_nacl is true. 34 # enable_pnacl and always build them if enable_nacl is true.
35 # The "is_nacl" part of the condition is needed to ensure that 35 # The "is_nacl" part of the condition is needed to ensure that
36 # the untrusted code is built properly; arguably it should be 36 # the untrusted code is built properly; arguably it should be
37 # guarded by "is_nacl" directly rather than enable_nacl_untrusted, but 37 # guarded by "is_nacl" directly rather than enable_nacl_untrusted, but
38 # this will go away when Mac and Win are working and we can just use 38 # this will go away when Mac and Win are working and we can just use
39 # the commented out logic. 39 # the commented out logic.
40 # Eventually we want this to be: 40 # Eventually we want this to be:
41 # enable_nacl = !is_ios && !is_android && !is_chromecast 41 # enable_nacl = !is_ios && !is_android && !is_chromecast
42 enable_nacl = (is_mac || (is_linux && !is_chromeos) || is_nacl) && 42 enable_nacl = (is_linux || is_mac || is_nacl) && current_cpu != "mipsel" &&
43 current_cpu != "mipsel" && !is_chromecast 43 !is_chromecast
44 enable_nacl_untrusted = enable_nacl 44 enable_nacl_untrusted = enable_nacl
45 enable_pnacl = enable_nacl_untrusted 45 enable_pnacl = enable_nacl_untrusted
46 46
47 # If debug_devtools is set to true, JavaScript files for DevTools are stored 47 # If debug_devtools is set to true, JavaScript files for DevTools are stored
48 # as is and loaded from disk. Otherwise, a concatenated file is stored in 48 # as is and loaded from disk. Otherwise, a concatenated file is stored in
49 # resources.pak. It is still possible to load JS files from disk by passing 49 # resources.pak. It is still possible to load JS files from disk by passing
50 # --debug-devtools cmdline switch. 50 # --debug-devtools cmdline switch.
51 debug_devtools = false 51 debug_devtools = false
52 52
53 # Enables WebRTC. 53 # Enables WebRTC.
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 use_gconf = is_linux && !is_chromeos && !is_chromecast && !is_headless 196 use_gconf = is_linux && !is_chromeos && !is_chromecast && !is_headless
197 197
198 # Whether to back up data before sync. 198 # Whether to back up data before sync.
199 enable_pre_sync_backup = is_win || is_mac || (is_linux && !is_chromeos) 199 enable_pre_sync_backup = is_win || is_mac || (is_linux && !is_chromeos)
200 200
201 # Enable WebVR support by default on Android 201 # Enable WebVR support by default on Android
202 # Still requires command line flag to access API 202 # Still requires command line flag to access API
203 enable_webvr = is_android 203 enable_webvr = is_android
204 204
205 use_gio = is_desktop_linux && !is_headless 205 use_gio = is_desktop_linux && !is_headless
OLDNEW
« no previous file with comments | « no previous file | ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698