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

Unified Diff: build/common.gypi

Issue 3173001: Lands http://codereview.chromium.org/3166002 for bryeung: (Closed)
Patch Set: Created 10 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 54077421902834894389cf779ba70403e2bcc402..c27dc755470a187ff50fe1bad29356a013a9f1c4 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -61,6 +61,9 @@
# toolkit_views test below.
'chromeos%': '0',
+ # Disable touch support by default.
+ 'touchui%': 0,
+
# To do a shared build on linux we need to be able to choose between
# type static_library and shared_library. We default to doing a static
# build but you can override this with "gyp -Dlibrary=shared_library"
@@ -70,11 +73,12 @@
'library%': 'static_library',
},
- # Set default value of toolkit_views on for Windows and Chrome OS.
+ # Set default value of toolkit_views on for Windows, Chrome OS
+ # and the touch UI.
# We set it at this level of nesting so the value is available for
# other conditionals below.
'conditions': [
- ['OS=="win" or chromeos==1', {
+ ['OS=="win" or chromeos==1 or touchui==1', {
'toolkit_views%': 1,
}, {
'toolkit_views%': 0,
@@ -94,8 +98,9 @@
'linux_chromium_dump_symbols%': 0,
# Also see linux_strip_binary below.
- # Copy conditionally-set chromeos variable out one scope.
+ # Copy conditionally-set chromeos and touchui variables out one scope.
'chromeos%': '<(chromeos)',
+ 'touchui%': '<(touchui)',
# This variable tells WebCore.gyp and JavaScriptCore.gyp whether they are
# are built under a chromium full build (1) or a webkit.org chromium
@@ -146,6 +151,7 @@
'host_arch%': '<(host_arch)',
'toolkit_views%': '<(toolkit_views)',
'chromeos%': '<(chromeos)',
+ 'touchui%': '<(touchui)',
'inside_chromium_build%': '<(inside_chromium_build)',
'fastbuild%': '<(fastbuild)',
'linux_fpic%': '<(linux_fpic)',
@@ -380,9 +386,6 @@
'sk', 'sl', 'sr', 'sv', 'sw', 'ta', 'te', 'th', 'tr', 'uk',
'vi', 'zh-CN', 'zh-TW',
],
-
- # Disable touch support by default.
- 'touchui%': 0,
},
'target_defaults': {
'variables': {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698