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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_features.gyp ('k') | chrome/common/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_features.gypi
diff --git a/chrome/chrome_features.gypi b/chrome/chrome_features.gypi
index a4d875670a3c33f6f41fad3d9b80cd953c631e32..06488b1e8afce75d860df7a074cc4dcb72734685 100644
--- a/chrome/chrome_features.gypi
+++ b/chrome/chrome_features.gypi
@@ -10,6 +10,11 @@
'variables': {
# Conditional variables.
'conditions': [
+ ['OS=="android"', {
+ 'android_java_ui%': 1,
+ }, {
+ 'android_java_ui': 0,
+ }],
['OS=="android" or OS=="ios"', {
'enable_google_now%': 0,
}, {
@@ -21,6 +26,7 @@
# Anything in the conditions needs to be copied to the outer scope to be
# accessible.
'enable_google_now%': '<(enable_google_now)',
+ 'android_java_ui%': '<(android_java_ui)',
# Grit defines based on the feature flags. These must be manually added to
# grit targets.
« no previous file with comments | « chrome/chrome_features.gyp ('k') | chrome/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698