summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_features.gypi
diff options
context:
space:
mode:
authorsievers <sievers@chromium.org>2015-12-04 10:43:56 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-04 18:44:41 +0000
commit2f1e811f2b4b8b3d7ea70cdbd4bd3c1bef3acb6a (patch)
tree2ae3e3cc3e218d8a63aa16bbbc1aa1028d578ed1 /chrome/chrome_features.gypi
parent6ead8b09e18913bb92e93788119a20f0c095f86f (diff)
downloadchromium_src-2f1e811f2b4b8b3d7ea70cdbd4bd3c1bef3acb6a.zip
chromium_src-2f1e811f2b4b8b3d7ea70cdbd4bd3c1bef3acb6a.tar.gz
chromium_src-2f1e811f2b4b8b3d7ea70cdbd4bd3c1bef3acb6a.tar.bz2
Android: Allow compiling browser without Java UI
Currently OS_ANDROID is used in many places to invoke Java UI-specific codepaths. Introduce ANDROID_JAVA_UI instead where this makes sense. Exclude all android sources from chrome/browser/android and chrome/browser/ui/android when this is not set. Most of these have dependencies on the Java UI or tab model. Some of the features will need revisiting / untangling. BUG=557285,507792 NOTRY=True Review URL: https://codereview.chromium.org/1459793002 Cr-Commit-Position: refs/heads/master@{#363255}
Diffstat (limited to 'chrome/chrome_features.gypi')
-rw-r--r--chrome/chrome_features.gypi6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/chrome_features.gypi b/chrome/chrome_features.gypi
index a4d8756..06488b1 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.