Remove defunct chromeos_gtk gyp variable.
BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/9720008 git-svn-id: http://src.chromium.org/svn/trunk/src/build@127474 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
84ec34dce5
Коммит
ca38449a6a
38
all.gyp
38
all.gyp
|
@ -542,44 +542,6 @@
|
|||
}], # branding=="Chrome"
|
||||
], # conditions
|
||||
}], # OS="win"
|
||||
# Old ChromeOS target needed to build pre-Aura targets.
|
||||
['chromeos_gtk==1', {
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'chromeos_builder',
|
||||
'type': 'none',
|
||||
'dependencies': [
|
||||
'../base/base.gyp:base_unittests',
|
||||
'../chrome/chrome.gyp:browser_tests',
|
||||
'../chrome/chrome.gyp:chrome',
|
||||
'../chrome/chrome.gyp:interactive_ui_tests',
|
||||
'../chrome/chrome.gyp:performance_browser_tests',
|
||||
'../chrome/chrome.gyp:performance_ui_tests',
|
||||
'../chrome/chrome.gyp:safe_browsing_tests',
|
||||
'../chrome/chrome.gyp:sync_integration_tests',
|
||||
'../chrome/chrome.gyp:sync_unit_tests',
|
||||
'../chrome/chrome.gyp:ui_tests',
|
||||
'../chrome/chrome.gyp:unit_tests',
|
||||
'../content/content.gyp:content_unittests',
|
||||
'../crypto/crypto.gyp:crypto_unittests',
|
||||
'../dbus/dbus.gyp:dbus_unittests',
|
||||
'../ipc/ipc.gyp:ipc_tests',
|
||||
'../jingle/jingle.gyp:jingle_unittests',
|
||||
'../media/media.gyp:ffmpeg_tests',
|
||||
'../media/media.gyp:media_unittests',
|
||||
'../net/net.gyp:net_unittests',
|
||||
'../printing/printing.gyp:printing_unittests',
|
||||
'../remoting/remoting.gyp:remoting_unittests',
|
||||
'../sql/sql.gyp:sql_unittests',
|
||||
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
|
||||
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
|
||||
'../ui/ui.gyp:gfx_unittests',
|
||||
'../ui/views/views.gyp:views_unittests',
|
||||
'temp_gyp/googleurl.gyp:googleurl_unittests',
|
||||
],
|
||||
},
|
||||
], # targets
|
||||
}], # "chromeos_gtk==1"
|
||||
['use_aura==1', {
|
||||
'targets': [
|
||||
{
|
||||
|
|
13
common.gypi
13
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)',
|
||||
|
|
Загрузка…
Ссылка в новой задаче