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

Side by Side Diff: chrome/chrome_features.gypi

Issue 1722743002: Adds ability for chrome to behave as mojo_runner (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge to tip of tree Created 4 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
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': {
(...skipping 15 matching lines...) Expand all
26 # pages. https://github.com/polymer/vulcanize 26 # pages. https://github.com/polymer/vulcanize
27 'use_vulcanize%': 1, 27 'use_vulcanize%': 1,
28 }, 28 },
29 29
30 # Anything in the conditions needs to be copied to the outer scope to be 30 # Anything in the conditions needs to be copied to the outer scope to be
31 # accessible. 31 # accessible.
32 'enable_google_now%': '<(enable_google_now)', 32 'enable_google_now%': '<(enable_google_now)',
33 'android_java_ui%': '<(android_java_ui)', 33 'android_java_ui%': '<(android_java_ui)',
34 'use_vulcanize%': '<(use_vulcanize)', 34 'use_vulcanize%': '<(use_vulcanize)',
35 35
36 # GN only, but defined here so BUILDFLAG works without ifdef.
37 'enable_package_mash_services%': 0,
38
36 # Grit defines based on the feature flags. These must be manually added to 39 # Grit defines based on the feature flags. These must be manually added to
37 # grit targets. 40 # grit targets.
38 'chrome_grit_defines': [ 41 'chrome_grit_defines': [
39 '-D', 'enable_google_now=<(enable_google_now)', 42 '-D', 'enable_google_now=<(enable_google_now)',
40 '-D', 'use_vulcanize=<(use_vulcanize)', 43 '-D', 'use_vulcanize=<(use_vulcanize)',
41 ], 44 ],
42 }, 45 },
43 } 46 }
OLDNEW
« no previous file with comments | « chrome/chrome_features.gyp ('k') | chrome/common/BUILD.gn » ('j') | chrome/common/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698