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

Side by Side Diff: chrome/chrome_features.gypi

Issue 1459793002: Android: Allow compiling browser without Java UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years 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"', {
14 'android_java_ui%': 1,
15 }, {
16 'android_java_ui': 0,
17 }],
13 ['OS=="android" or OS=="ios"', { 18 ['OS=="android" or OS=="ios"', {
14 'enable_google_now%': 0, 19 'enable_google_now%': 0,
15 }, { 20 }, {
16 'enable_google_now%': 1, 21 'enable_google_now%': 1,
17 }] 22 }]
18 ], 23 ],
19 }, 24 },
20 25
21 # Anything in the conditions needs to be copied to the outer scope to be 26 # Anything in the conditions needs to be copied to the outer scope to be
22 # accessible. 27 # accessible.
23 'enable_google_now%': '<(enable_google_now)', 28 'enable_google_now%': '<(enable_google_now)',
29 'android_java_ui%': '<(android_java_ui)',
24 30
25 # Grit defines based on the feature flags. These must be manually added to 31 # Grit defines based on the feature flags. These must be manually added to
26 # grit targets. 32 # grit targets.
27 'chrome_grit_defines': [ 33 'chrome_grit_defines': [
28 '-D', 'enable_google_now=<(enable_google_now)', 34 '-D', 'enable_google_now=<(enable_google_now)',
29 ] 35 ]
30 }, 36 },
31 } 37 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698