| 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 |
| (...skipping 2225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2236 '<(INTERMEDIATE_DIR)/repack/he.pak', | 2236 '<(INTERMEDIATE_DIR)/repack/he.pak', |
| 2237 '<(INTERMEDIATE_DIR)/repack/zh-TW.pak', | 2237 '<(INTERMEDIATE_DIR)/repack/zh-TW.pak', |
| 2238 ], | 2238 ], |
| 2239 }, | 2239 }, |
| 2240 { | 2240 { |
| 2241 'destination': '<(PRODUCT_DIR)/themes', | 2241 'destination': '<(PRODUCT_DIR)/themes', |
| 2242 'files': ['<(INTERMEDIATE_DIR)/repack/default.pak'], | 2242 'files': ['<(INTERMEDIATE_DIR)/repack/default.pak'], |
| 2243 }, | 2243 }, |
| 2244 ], | 2244 ], |
| 2245 }], | 2245 }], |
| 2246 ['OS=="linux" and toolkit_views==1', { | 2246 ['OS=="linux" and (toolkit_views==1 or linux2==1)', { |
| 2247 'dependencies': [ | 2247 'dependencies': [ |
| 2248 '../views/views.gyp:views', | 2248 '../views/views.gyp:views', |
| 2249 ], | 2249 ], |
| 2250 }], | 2250 }], |
| 2251 ['OS=="mac"', { | 2251 ['OS=="mac"', { |
| 2252 # 'branding' is a variable defined in common.gypi | 2252 # 'branding' is a variable defined in common.gypi |
| 2253 # (e.g. "Chromium", "Chrome") | 2253 # (e.g. "Chromium", "Chrome") |
| 2254 'conditions': [ | 2254 'conditions': [ |
| 2255 ['branding=="Chrome"', { | 2255 ['branding=="Chrome"', { |
| 2256 'mac_bundle_resources': ['app/theme/google_chrome/app.icns'], | 2256 'mac_bundle_resources': ['app/theme/google_chrome/app.icns'], |
| (...skipping 2082 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4339 # Use outputs of this action as inputs for the main target build. | 4339 # Use outputs of this action as inputs for the main target build. |
| 4340 # Seems as a misnomer but makes this happy on Linux (scons). | 4340 # Seems as a misnomer but makes this happy on Linux (scons). |
| 4341 'process_outputs_as_sources': 1, | 4341 'process_outputs_as_sources': 1, |
| 4342 }, | 4342 }, |
| 4343 ], # 'actions' | 4343 ], # 'actions' |
| 4344 }, | 4344 }, |
| 4345 ] | 4345 ] |
| 4346 }], | 4346 }], |
| 4347 ], # 'conditions' | 4347 ], # 'conditions' |
| 4348 } | 4348 } |
| OLD | NEW |