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

Unified Diff: build/common.gypi

Issue 9720008: Remove defunct chromeos_gtk gyp variable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 8 years, 9 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 | « build/all.gyp ('k') | 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 a29378ac553fff07fef43296e5d2fba495306e3d..4f2b768cf4f1cd9fd2ce27e404fc6096af2c9d2c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -21,9 +21,6 @@
# Whether we're building a ChromeOS build.
'chromeos%': 0,
- # Whether we're building pre-Aura ChromeOS (using GTK).
- 'chromeos_gtk%': 0,
-
# Whether we are using Views Toolkit
'toolkit_views%': 0,
@@ -44,7 +41,6 @@
},
# Copy conditionally-set variables out one scope.
'chromeos%': '<(chromeos)',
- 'chromeos_gtk%': '<(chromeos_gtk)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
'use_openssl%': '<(use_openssl)',
@@ -78,22 +74,16 @@
}],
# Set default value of toolkit_views based on OS.
- ['OS=="win" or chromeos==1 or chromeos_gtk==1 or use_aura==1', {
+ ['OS=="win" or chromeos==1 or use_aura==1', {
'toolkit_views%': 1,
}, {
'toolkit_views%': 0,
}],
-
- # ChromeOS GTK implies ChromeOS.
- ['chromeos_gtk==1', {
- 'chromeos%': 1,
- }],
],
},
# Copy conditionally-set variables out one scope.
'chromeos%': '<(chromeos)',
- 'chromeos_gtk%': '<(chromeos_gtk)',
'host_arch%': '<(host_arch)',
'toolkit_views%': '<(toolkit_views)',
'use_aura%': '<(use_aura)',
@@ -462,7 +452,6 @@
'enable_flapper_hacks%': '<(enable_flapper_hacks)',
'enable_pepper_threading%': '<(enable_pepper_threading)',
'chromeos%': '<(chromeos)',
- 'chromeos_gtk%': '<(chromeos_gtk)',
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
'enable_viewport%': '<(enable_viewport)',
'use_xi2_mt%':'<(use_xi2_mt)',
« no previous file with comments | « build/all.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698