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

Side by Side Diff: chrome/chrome_features.gypi

Issue 1494253003: MD Downloads: add a use_vulcanize option to Chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert common.gypi change Created 4 years, 11 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
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 is the GYP equivalent of //chrome/common/features.gni. 5 # This is the GYP equivalent of //chrome/common/features.gni.
6 # Please keep in sync! 6 # Please keep in sync!
7 7
8 { 8 {
9 'variables': { 9 'variables': {
10 'variables': { 10 'variables': {
11 # Conditional variables. 11 # Conditional variables.
12 'conditions': [ 12 'conditions': [
13 ['OS=="android"', { 13 ['OS=="android"', {
14 'android_java_ui%': 1, 14 'android_java_ui%': 1,
15 }, { 15 }, {
16 'android_java_ui': 0, 16 'android_java_ui': 0,
17 }], 17 }],
18 ['OS=="android" or OS=="ios"', { 18 ['OS=="android" or OS=="ios"', {
19 'enable_google_now%': 0, 19 'enable_google_now%': 0,
20 }, { 20 }, {
21 'enable_google_now%': 1, 21 'enable_google_now%': 1,
22 }] 22 }]
23 ], 23 ],
24
25 'use_vulcanize%': 1,
Nico 2015/12/30 14:29:22 shouldn't this default to 0?
Dan Beam 2015/12/30 17:11:12 no
Dan Beam 2015/12/30 17:22:53 i only asked you to review part of this CL, so you
24 }, 26 },
25 27
26 # Anything in the conditions needs to be copied to the outer scope to be 28 # Anything in the conditions needs to be copied to the outer scope to be
27 # accessible. 29 # accessible.
28 'enable_google_now%': '<(enable_google_now)', 30 'enable_google_now%': '<(enable_google_now)',
29 'android_java_ui%': '<(android_java_ui)', 31 'android_java_ui%': '<(android_java_ui)',
32 'use_vulcanize%': '<(use_vulcanize)',
30 33
31 # Grit defines based on the feature flags. These must be manually added to 34 # Grit defines based on the feature flags. These must be manually added to
32 # grit targets. 35 # grit targets.
33 'chrome_grit_defines': [ 36 'chrome_grit_defines': [
34 '-D', 'enable_google_now=<(enable_google_now)', 37 '-D', 'enable_google_now=<(enable_google_now)',
38 '-D', 'use_vulcanize=<(use_vulcanize)',
35 ] 39 ]
36 }, 40 },
37 } 41 }
OLDNEW
« no previous file with comments | « chrome/chrome_features.gyp ('k') | chrome/common/BUILD.gn » ('j') | chrome/common/features.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698