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

Side by Side Diff: chrome/chrome.gyp

Issue 149367: Replace instances of LINUX2 with OS_CHROMEOS and linux2 with chromeos. (Closed)
Patch Set: Created 11 years, 5 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/views/tabs/dragged_tab_view.cc ('k') | views/widget/widget_gtk.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 '<(grit_out_dir)/theme_resources.pak', 222 '<(grit_out_dir)/theme_resources.pak',
223 '<(grit_out_dir)/theme_resources.rc', 223 '<(grit_out_dir)/theme_resources.rc',
224 ], 224 ],
225 'action': [ 225 'action': [
226 'python', '<(grit_path)', 226 'python', '<(grit_path)',
227 '-i', '<(input_path)', 'build', 227 '-i', '<(input_path)', 'build',
228 '-o', '<(grit_out_dir)', 228 '-o', '<(grit_out_dir)',
229 '-D', '<(chrome_build)' 229 '-D', '<(chrome_build)'
230 ], 230 ],
231 'conditions': [ 231 'conditions': [
232 ['linux2==1', { 232 ['chromeos==1', {
233 'action': ['-D', 'linux2'], 233 'action': ['-D', 'chromeos'],
234 }], 234 }],
235 ], 235 ],
236 'message': 'Generating resources from <(input_path)', 236 'message': 'Generating resources from <(input_path)',
237 }, 237 },
238 ], 238 ],
239 'direct_dependent_settings': { 239 'direct_dependent_settings': {
240 'include_dirs': [ 240 'include_dirs': [
241 '<(grit_out_dir)', 241 '<(grit_out_dir)',
242 ], 242 ],
243 }, 243 },
(...skipping 1826 matching lines...) Expand 10 before | Expand all | Expand 10 after
2070 2070
2071 # Other excluded stuff. 2071 # Other excluded stuff.
2072 ['exclude', '^browser/browser_theme_provider_gtk.cc'], 2072 ['exclude', '^browser/browser_theme_provider_gtk.cc'],
2073 ['exclude', '^browser/extensions/external_registry_extension_pro vider_win.cc'], 2073 ['exclude', '^browser/extensions/external_registry_extension_pro vider_win.cc'],
2074 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'], 2074 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'],
2075 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'], 2075 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'],
2076 ['exclude', '^browser/tab_contents/render_view_context_menu_gtk. cc'], 2076 ['exclude', '^browser/tab_contents/render_view_context_menu_gtk. cc'],
2077 ['exclude', '^browser/tab_contents/render_view_context_menu_gtk. h'], 2077 ['exclude', '^browser/tab_contents/render_view_context_menu_gtk. h'],
2078 ], 2078 ],
2079 }], 2079 }],
2080 ['linux2==1',{ 2080 ['chromeos==1',{
2081 'sources/': [ 2081 'sources/': [
2082 ['include', 'browser/views/new_browser_window_widget.cc'], 2082 ['include', 'browser/views/new_browser_window_widget.cc'],
2083 ['include', 'browser/views/new_browser_window_widget.h'], 2083 ['include', 'browser/views/new_browser_window_widget.h'],
2084 ['include', 'browser/views/panel_controller.cc'], 2084 ['include', 'browser/views/panel_controller.cc'],
2085 ['include', 'browser/views/panel_controller.h'], 2085 ['include', 'browser/views/panel_controller.h'],
2086 ['include', 'browser/views/tabs/grid.cc'], 2086 ['include', 'browser/views/tabs/grid.cc'],
2087 ['include', 'browser/views/tabs/grid.h'], 2087 ['include', 'browser/views/tabs/grid.h'],
2088 ['include', 'browser/views/tabs/tab_overview_cell.cc'], 2088 ['include', 'browser/views/tabs/tab_overview_cell.cc'],
2089 ['include', 'browser/views/tabs/tab_overview_cell.h'], 2089 ['include', 'browser/views/tabs/tab_overview_cell.h'],
2090 ['include', 'browser/views/tabs/tab_overview_container.cc'], 2090 ['include', 'browser/views/tabs/tab_overview_container.cc'],
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
2541 '<(INTERMEDIATE_DIR)/repack/he.pak', 2541 '<(INTERMEDIATE_DIR)/repack/he.pak',
2542 '<(INTERMEDIATE_DIR)/repack/zh-TW.pak', 2542 '<(INTERMEDIATE_DIR)/repack/zh-TW.pak',
2543 ], 2543 ],
2544 }, 2544 },
2545 { 2545 {
2546 'destination': '<(PRODUCT_DIR)/themes', 2546 'destination': '<(PRODUCT_DIR)/themes',
2547 'files': ['<(INTERMEDIATE_DIR)/repack/default.pak'], 2547 'files': ['<(INTERMEDIATE_DIR)/repack/default.pak'],
2548 }, 2548 },
2549 ], 2549 ],
2550 }], 2550 }],
2551 ['OS=="linux" and (toolkit_views==1 or linux2==1)', { 2551 ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
2552 'dependencies': [ 2552 'dependencies': [
2553 '../views/views.gyp:views', 2553 '../views/views.gyp:views',
2554 ], 2554 ],
2555 }], 2555 }],
2556 ['OS=="mac"', { 2556 ['OS=="mac"', {
2557 # 'branding' is a variable defined in common.gypi 2557 # 'branding' is a variable defined in common.gypi
2558 # (e.g. "Chromium", "Chrome") 2558 # (e.g. "Chromium", "Chrome")
2559 'conditions': [ 2559 'conditions': [
2560 ['branding=="Chrome"', { 2560 ['branding=="Chrome"', {
2561 'mac_bundle_resources': ['app/theme/google_chrome/app.icns'], 2561 'mac_bundle_resources': ['app/theme/google_chrome/app.icns'],
(...skipping 1089 matching lines...) Expand 10 before | Expand all | Expand 10 after
3651 # This test is mostly about renaming downloads to safe file 3651 # This test is mostly about renaming downloads to safe file
3652 # names. As such we don't need/want to port it to linux. We 3652 # names. As such we don't need/want to port it to linux. We
3653 # might want to write our own tests for the download manager 3653 # might want to write our own tests for the download manager
3654 # on linux, though. 3654 # on linux, though.
3655 'browser/download/download_manager_unittest.cc', 3655 'browser/download/download_manager_unittest.cc',
3656 'browser/views/bookmark_context_menu_test.cc', 3656 'browser/views/bookmark_context_menu_test.cc',
3657 # Compact Language Detection (cld) is not supported in linux yet. 3657 # Compact Language Detection (cld) is not supported in linux yet.
3658 '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/ compact_lang_det_unittest_small.cc', 3658 '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/ compact_lang_det_unittest_small.cc',
3659 ], 3659 ],
3660 }], 3660 }],
3661 ['OS=="linux" and (toolkit_views==1 or linux2==1)', { 3661 ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
3662 'dependencies': [ 3662 'dependencies': [
3663 '../views/views.gyp:views', 3663 '../views/views.gyp:views',
3664 ], 3664 ],
3665 }], 3665 }],
3666 ['OS=="mac"', { 3666 ['OS=="mac"', {
3667 # The test fetches resources which means Mac need the app bundle to 3667 # The test fetches resources which means Mac need the app bundle to
3668 # exist on disk so it can pull from it. 3668 # exist on disk so it can pull from it.
3669 'dependencies': [ 3669 'dependencies': [
3670 'chrome', 3670 'chrome',
3671 ], 3671 ],
(...skipping 1222 matching lines...) Expand 10 before | Expand all | Expand 10 after
4894 # Use outputs of this action as inputs for the main target build. 4894 # Use outputs of this action as inputs for the main target build.
4895 # Seems as a misnomer but makes this happy on Linux (scons). 4895 # Seems as a misnomer but makes this happy on Linux (scons).
4896 'process_outputs_as_sources': 1, 4896 'process_outputs_as_sources': 1,
4897 }, 4897 },
4898 ], # 'actions' 4898 ], # 'actions'
4899 }, 4899 },
4900 ] 4900 ]
4901 }], 4901 }],
4902 ], # 'conditions' 4902 ], # 'conditions'
4903 } 4903 }
OLDNEW
« no previous file with comments | « chrome/browser/views/tabs/dragged_tab_view.cc ('k') | views/widget/widget_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698