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

Side by Side Diff: mojo/public/mojo.gni

Issue 939753003: Fix buggy usage of global variables in the build system (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « build/module_args/mojo.gni ('k') | no next file » | 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 import("//build/module_args/mojo.gni") 5 import("//build/module_args/mojo.gni")
6 6
7 # If using the prebuilt shell, gate its usage by the platforms for which it is 7 # If using the prebuilt shell, gate its usage by the platforms for which it is
8 # published. 8 # published.
9 if (!defined(use_prebuilt_mojo_shell) || use_prebuilt_mojo_shell) { 9 use_prebuilt_mojo_shell = false
10 if (!defined(build_mojo_shell_from_source) || !build_mojo_shell_from_source) {
10 use_prebuilt_mojo_shell = is_linux || is_android 11 use_prebuilt_mojo_shell = is_linux || is_android
11 } 12 }
12 13
13 # If using the prebuilt network service, gate its usage by the platforms for 14 # If using the prebuilt network service, gate its usage by the platforms for
14 # which it is published. 15 # which it is published.
15 if (!defined(use_prebuilt_network_service) || use_prebuilt_network_service) { 16 use_prebuilt_network_service = false
17 if (!defined(build_network_service_from_source) ||
18 !build_network_service_from_source) {
16 use_prebuilt_network_service = is_linux || is_android 19 use_prebuilt_network_service = is_linux || is_android
17 } 20 }
18 21
19 # The absolute path to the directory containing the mojo public SDK (i.e., the 22 # The absolute path to the directory containing the mojo public SDK (i.e., the
20 # directory containing mojo/public). The build files within the Mojo public 23 # directory containing mojo/public). The build files within the Mojo public
21 # SDK use this variable to allow themselves to be parameterized by the location 24 # SDK use this variable to allow themselves to be parameterized by the location
22 # of the public SDK within a client repo. 25 # of the public SDK within a client repo.
23 mojo_root = get_path_info("../..", "abspath") 26 mojo_root = get_path_info("../..", "abspath")
OLDNEW
« no previous file with comments | « build/module_args/mojo.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698