summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authortedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 20:50:38 +0000
committertedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 20:50:38 +0000
commit6b40bb5882a2542b41bc1ff088f93ba49bd41a9e (patch)
treeac57f03cb308e15e49bd8c904d17b90bf2df806b /build
parent89c3fe01167dd7eeb0b89b351fbd4d9d7d8ebea0 (diff)
downloadchromium_src-6b40bb5882a2542b41bc1ff088f93ba49bd41a9e.zip
chromium_src-6b40bb5882a2542b41bc1ff088f93ba49bd41a9e.tar.gz
chromium_src-6b40bb5882a2542b41bc1ff088f93ba49bd41a9e.tar.bz2
Chrome on Android : Begin removing references to themes.
Android will not in the forseeeable future be supporting themes, so this begins removing their support to get unit_tests linking upstream for android. BUG=113487 TEST= Review URL: http://codereview.chromium.org/9515010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi10
1 files changed, 10 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index ab23f94..702a1fd 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -242,6 +242,10 @@
# plugins to make call of the main thread.
'enable_pepper_threading%': 0,
+ # Enables theme support, which is enabled by default. Support for
+ # disabling depends on the platform.
+ 'enable_themes%': 1,
+
# XInput2 multitouch support is disabled by default (use_xi2_mt=0).
# Setting to non-zero value enables XI2 MT. When XI2 MT is enabled,
# the input value also defines the required XI2 minor minimum version.
@@ -486,6 +490,7 @@
'enable_web_intents%': '<(enable_web_intents)',
'enable_web_intents_tag%': '<(enable_web_intents_tag)',
'enable_plugin_installation%': '<(enable_plugin_installation)',
+ 'enable_themes%': '<(enable_themes)',
'linux_use_gold_binary%': '<(linux_use_gold_binary)',
'linux_use_gold_flags%': '<(linux_use_gold_flags)',
'use_canvas_skia_skia%': '<(use_canvas_skia_skia)',
@@ -771,6 +776,8 @@
'input_speech%': 0,
'enable_web_intents%': 0,
'java_bridge%': 1,
+ # Android does not support themes.
+ 'enable_themes%': 0,
# Set to 1 once we have a notification system for Android.
# http://crbug.com/115320
@@ -1349,6 +1356,9 @@
['enable_plugin_installation==1', {
'defines': ['ENABLE_PLUGIN_INSTALLATION=1'],
}],
+ ['enable_themes==1', {
+ 'defines': ['ENABLE_THEMES=1'],
+ }],
], # conditions for 'target_defaults'
'target_conditions': [
['enable_wexit_time_destructors==1', {