| OLD | NEW | 
|---|
| 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 | 
| 11     # Linux or Mac, and into chrome.dll on Windows. | 11     # Linux or Mac, and into chrome.dll on Windows. | 
| 12     'chromium_dependencies': [ | 12     'chromium_dependencies': [ | 
| 13       'common', | 13       'common', | 
| 14       'browser', | 14       'browser', | 
| 15       'debugger', | 15       'debugger', | 
| 16       'renderer', | 16       'renderer', | 
| 17       'utility', | 17       'utility', | 
| 18       'worker', | 18       'worker', | 
| 19       '../printing/printing.gyp:printing', | 19       '../printing/printing.gyp:printing', | 
| 20       '../webkit/webkit.gyp:inspector_resources', | 20       '../webkit/webkit.gyp:inspector_resources', | 
| 21     ], | 21     ], | 
| 22     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 22     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 
|  | 23     'mac_xib_localizer_tool_path': '<(DEPTH)/build/mac/generate_localizer', | 
|  | 24     'mac_xib_localizers_dir': '<(INTERMEDIATE_DIR)/xib_localizers', | 
| 23     'browser_tests_sources': [ | 25     'browser_tests_sources': [ | 
| 24       'browser/browser_browsertest.cc', | 26       'browser/browser_browsertest.cc', | 
| 25       'browser/crash_recovery_browsertest.cc', | 27       'browser/crash_recovery_browsertest.cc', | 
| 26       'browser/ssl/ssl_browser_tests.cc', | 28       'browser/ssl/ssl_browser_tests.cc', | 
| 27     ], | 29     ], | 
| 28     'browser_tests_sources_win_specific': [ | 30     'browser_tests_sources_win_specific': [ | 
| 29       'browser/extensions/extension_shelf_model_unittest.cc', | 31       'browser/extensions/extension_shelf_model_unittest.cc', | 
| 30       'browser/extensions/extension_startup_unittest.cc', | 32       'browser/extensions/extension_startup_unittest.cc', | 
| 31       'browser/extensions/extension_browsertest.cc', | 33       'browser/extensions/extension_browsertest.cc', | 
| 32       'browser/extensions/extension_browsertest.h', | 34       'browser/extensions/extension_browsertest.h', | 
| (...skipping 1957 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1990               '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', | 1992               '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', | 
| 1991             ], | 1993             ], | 
| 1992           }, | 1994           }, | 
| 1993           'actions': [ | 1995           'actions': [ | 
| 1994             # This block of actions are used to extract the localization data | 1996             # This block of actions are used to extract the localization data | 
| 1995             # from xib files and generate a localizer out of it. | 1997             # from xib files and generate a localizer out of it. | 
| 1996             { | 1998             { | 
| 1997               'action_name': 'process_mainmenu_xib', | 1999               'action_name': 'process_mainmenu_xib', | 
| 1998               'process_outputs_as_sources': 1, | 2000               'process_outputs_as_sources': 1, | 
| 1999               'inputs': [ | 2001               'inputs': [ | 
| 2000                 '<(DEPTH)/build/mac/generate_localizer', | 2002                 '<(mac_xib_localizer_tool_path)', | 
| 2001                 'app/nibs/MainMenu.xib' | 2003                 'app/nibs/MainMenu.xib' | 
| 2002               ], | 2004               ], | 
| 2003               'outputs': [ | 2005               'outputs': [ | 
| 2004                 '<(INTERMEDIATE_DIR)/xib_localizers/main_menu_localizer.h', | 2006                 '<(mac_xib_localizers_dir)/main_menu_localizer.h', | 
| 2005                 '<(INTERMEDIATE_DIR)/xib_localizers/main_menu_localizer.mm', | 2007                 '<(mac_xib_localizers_dir)/main_menu_localizer.mm', | 
| 2006               ], | 2008               ], | 
| 2007               'action': ['<@(_inputs)', '<@(_outputs)'], | 2009               'action': ['<@(_inputs)', '<@(_outputs)'], | 
| 2008             }, | 2010             }, | 
| 2009             # TODO(tvl): add other xibs | 2011             # TODO(tvl): add other xibs | 
| 2010           ], | 2012           ], | 
| 2011         }], | 2013         }], | 
| 2012         ['OS=="win"', { | 2014         ['OS=="win"', { | 
| 2013           'defines': [ | 2015           'defines': [ | 
| 2014             '__STD_C', | 2016             '__STD_C', | 
| 2015             '_CRT_SECURE_NO_DEPRECATE', | 2017             '_CRT_SECURE_NO_DEPRECATE', | 
| (...skipping 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3171               ], | 3173               ], | 
| 3172             }, | 3174             }, | 
| 3173             { | 3175             { | 
| 3174               # TODO(mark): Make this work with more languages than the | 3176               # TODO(mark): Make this work with more languages than the | 
| 3175               # hardcoded da, en-US, he, zh-TW. | 3177               # hardcoded da, en-US, he, zh-TW. | 
| 3176               'action_name': 'repack_locale_da', | 3178               'action_name': 'repack_locale_da', | 
| 3177               'variables': { | 3179               'variables': { | 
| 3178                 'pak_inputs': [ | 3180                 'pak_inputs': [ | 
| 3179                   '<(grit_out_dir)/generated_resources_da.pak', | 3181                   '<(grit_out_dir)/generated_resources_da.pak', | 
| 3180                   '<(grit_out_dir)/locale_settings_da.pak', | 3182                   '<(grit_out_dir)/locale_settings_da.pak', | 
|  | 3183                   '<(SHARED_INTERMEDIATE_DIR)/app/app_strings_da.pak', | 
| 3181                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_da.pak', | 3184                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_da.pak', | 
| 3182                 ], | 3185                 ], | 
| 3183                 'conditions': [ | 3186                 'conditions': [ | 
| 3184                   ['branding=="Chrome"', { | 3187                   ['branding=="Chrome"', { | 
| 3185                     'pak_inputs': [ | 3188                     'pak_inputs': [ | 
| 3186                         '<(grit_out_dir)/google_chrome_strings_da.pak', | 3189                         '<(grit_out_dir)/google_chrome_strings_da.pak', | 
| 3187                       ] | 3190                       ] | 
| 3188                   }, {  # else: branding!="Chrome" | 3191                   }, {  # else: branding!="Chrome" | 
| 3189                     'pak_inputs': [ | 3192                     'pak_inputs': [ | 
| 3190                         '<(grit_out_dir)/chromium_strings_da.pak', | 3193                         '<(grit_out_dir)/chromium_strings_da.pak', | 
| (...skipping 19 matching lines...) Expand all  Loading... | 
| 3210               'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inp
      uts)'], | 3213               'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inp
      uts)'], | 
| 3211             }, | 3214             }, | 
| 3212             { | 3215             { | 
| 3213               # TODO(mark): Make this work with more languages than the | 3216               # TODO(mark): Make this work with more languages than the | 
| 3214               # hardcoded da, en-US, he, zh-TW. | 3217               # hardcoded da, en-US, he, zh-TW. | 
| 3215               'action_name': 'repack_locale_en_us', | 3218               'action_name': 'repack_locale_en_us', | 
| 3216               'variables': { | 3219               'variables': { | 
| 3217                 'pak_inputs': [ | 3220                 'pak_inputs': [ | 
| 3218                   '<(grit_out_dir)/generated_resources_en-US.pak', | 3221                   '<(grit_out_dir)/generated_resources_en-US.pak', | 
| 3219                   '<(grit_out_dir)/locale_settings_en-US.pak', | 3222                   '<(grit_out_dir)/locale_settings_en-US.pak', | 
|  | 3223                   '<(SHARED_INTERMEDIATE_DIR)/app/app_strings_en-US.pak', | 
| 3220                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', | 3224                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', | 
| 3221                 ], | 3225                 ], | 
| 3222                 'conditions': [ | 3226                 'conditions': [ | 
| 3223                   ['branding=="Chrome"', { | 3227                   ['branding=="Chrome"', { | 
| 3224                     'pak_inputs': [ | 3228                     'pak_inputs': [ | 
| 3225                         '<(grit_out_dir)/google_chrome_strings_en-US.pak', | 3229                         '<(grit_out_dir)/google_chrome_strings_en-US.pak', | 
| 3226                       ] | 3230                       ] | 
| 3227                   }, {  # else: branding!="Chrome" | 3231                   }, {  # else: branding!="Chrome" | 
| 3228                     'pak_inputs': [ | 3232                     'pak_inputs': [ | 
| 3229                         '<(grit_out_dir)/chromium_strings_en-US.pak', | 3233                         '<(grit_out_dir)/chromium_strings_en-US.pak', | 
| (...skipping 20 matching lines...) Expand all  Loading... | 
| 3250               'process_outputs_as_mac_bundle_resources': 1, | 3254               'process_outputs_as_mac_bundle_resources': 1, | 
| 3251             }, | 3255             }, | 
| 3252             { | 3256             { | 
| 3253               # TODO(mark): Make this work with more languages than the | 3257               # TODO(mark): Make this work with more languages than the | 
| 3254               # hardcoded da, en-US, he, zh-TW. | 3258               # hardcoded da, en-US, he, zh-TW. | 
| 3255               'action_name': 'repack_locale_he', | 3259               'action_name': 'repack_locale_he', | 
| 3256               'variables': { | 3260               'variables': { | 
| 3257                 'pak_inputs': [ | 3261                 'pak_inputs': [ | 
| 3258                   '<(grit_out_dir)/generated_resources_he.pak', | 3262                   '<(grit_out_dir)/generated_resources_he.pak', | 
| 3259                   '<(grit_out_dir)/locale_settings_he.pak', | 3263                   '<(grit_out_dir)/locale_settings_he.pak', | 
|  | 3264                   '<(SHARED_INTERMEDIATE_DIR)/app/app_strings_he.pak', | 
| 3260                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_he.pak', | 3265                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_he.pak', | 
| 3261                 ], | 3266                 ], | 
| 3262                 'conditions': [ | 3267                 'conditions': [ | 
| 3263                   ['branding=="Chrome"', { | 3268                   ['branding=="Chrome"', { | 
| 3264                     'pak_inputs': [ | 3269                     'pak_inputs': [ | 
| 3265                         '<(grit_out_dir)/google_chrome_strings_he.pak', | 3270                         '<(grit_out_dir)/google_chrome_strings_he.pak', | 
| 3266                       ] | 3271                       ] | 
| 3267                   }, {  # else: branding!="Chrome" | 3272                   }, {  # else: branding!="Chrome" | 
| 3268                     'pak_inputs': [ | 3273                     'pak_inputs': [ | 
| 3269                         '<(grit_out_dir)/chromium_strings_he.pak', | 3274                         '<(grit_out_dir)/chromium_strings_he.pak', | 
| (...skipping 19 matching lines...) Expand all  Loading... | 
| 3289               'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inp
      uts)'], | 3294               'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inp
      uts)'], | 
| 3290             }, | 3295             }, | 
| 3291             { | 3296             { | 
| 3292               # TODO(mark): Make this work with more languages than the | 3297               # TODO(mark): Make this work with more languages than the | 
| 3293               # hardcoded da, en-US, he, zh-TW. | 3298               # hardcoded da, en-US, he, zh-TW. | 
| 3294               'action_name': 'repack_locale_zh_tw', | 3299               'action_name': 'repack_locale_zh_tw', | 
| 3295               'variables': { | 3300               'variables': { | 
| 3296                 'pak_inputs': [ | 3301                 'pak_inputs': [ | 
| 3297                   '<(grit_out_dir)/generated_resources_zh-TW.pak', | 3302                   '<(grit_out_dir)/generated_resources_zh-TW.pak', | 
| 3298                   '<(grit_out_dir)/locale_settings_zh-TW.pak', | 3303                   '<(grit_out_dir)/locale_settings_zh-TW.pak', | 
|  | 3304                   '<(SHARED_INTERMEDIATE_DIR)/app/app_strings_zh-TW.pak', | 
| 3299                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_zh-TW.pak', | 3305                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_zh-TW.pak', | 
| 3300                 ], | 3306                 ], | 
| 3301                 'conditions': [ | 3307                 'conditions': [ | 
| 3302                   ['branding=="Chrome"', { | 3308                   ['branding=="Chrome"', { | 
| 3303                     'pak_inputs': [ | 3309                     'pak_inputs': [ | 
| 3304                         '<(grit_out_dir)/google_chrome_strings_zh-TW.pak', | 3310                         '<(grit_out_dir)/google_chrome_strings_zh-TW.pak', | 
| 3305                       ] | 3311                       ] | 
| 3306                   }, {  # else: branding!="Chrome" | 3312                   }, {  # else: branding!="Chrome" | 
| 3307                     'pak_inputs': [ | 3313                     'pak_inputs': [ | 
| 3308                         '<(grit_out_dir)/chromium_strings_zh-TW.pak', | 3314                         '<(grit_out_dir)/chromium_strings_zh-TW.pak', | 
| (...skipping 1860 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 5169               # Use outputs of this action as inputs for the main target build. | 5175               # Use outputs of this action as inputs for the main target build. | 
| 5170               # Seems as a misnomer but makes this happy on Linux (scons). | 5176               # Seems as a misnomer but makes this happy on Linux (scons). | 
| 5171               'process_outputs_as_sources': 1, | 5177               'process_outputs_as_sources': 1, | 
| 5172             }, | 5178             }, | 
| 5173           ],  # 'actions' | 5179           ],  # 'actions' | 
| 5174         }, | 5180         }, | 
| 5175       ] | 5181       ] | 
| 5176     }], | 5182     }], | 
| 5177   ],  # 'conditions' | 5183   ],  # 'conditions' | 
| 5178 } | 5184 } | 
| OLD | NEW | 
|---|