| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'variables': { | 5 'variables': { |
| 6 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 6 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 7 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], | 7 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], |
| 8 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 'chrome_resources', | 263 'chrome_resources', |
| 264 'chrome_strings', | 264 'chrome_strings', |
| 265 'platform_locale_settings', | 265 'platform_locale_settings', |
| 266 'theme_resources', | 266 'theme_resources', |
| 267 # TODO(zork): Protect this with if use_aura==1 | 267 # TODO(zork): Protect this with if use_aura==1 |
| 268 '<(DEPTH)/ash/ash_strings.gyp:ash_strings', | 268 '<(DEPTH)/ash/ash_strings.gyp:ash_strings', |
| 269 '<(DEPTH)/content/content_resources.gyp:content_resources', | 269 '<(DEPTH)/content/content_resources.gyp:content_resources', |
| 270 '<(DEPTH)/net/net.gyp:net_resources', | 270 '<(DEPTH)/net/net.gyp:net_resources', |
| 271 '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings', | 271 '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings', |
| 272 '<(DEPTH)/ui/ui.gyp:ui_resources', | 272 '<(DEPTH)/ui/ui.gyp:ui_resources', |
| 273 '<(DEPTH)/ui/ui.gyp:ui_resources_wallpapers', | |
| 274 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', | 273 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', |
| 275 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', | 274 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', |
| 276 ], | 275 ], |
| 277 'actions': [ | 276 'actions': [ |
| 278 { | 277 { |
| 279 'includes': ['chrome_repack_chrome.gypi'] | 278 'includes': ['chrome_repack_chrome.gypi'] |
| 280 }, | 279 }, |
| 281 { | 280 { |
| 282 'includes': ['chrome_repack_locales.gypi'] | 281 'includes': ['chrome_repack_locales.gypi'] |
| 283 }, | 282 }, |
| (...skipping 13 matching lines...) Expand all Loading... |
| 297 'includes': ['chrome_repack_chrome_touch_140_percent.gypi'] | 296 'includes': ['chrome_repack_chrome_touch_140_percent.gypi'] |
| 298 }, | 297 }, |
| 299 { | 298 { |
| 300 'includes': ['chrome_repack_chrome_touch_180_percent.gypi'] | 299 'includes': ['chrome_repack_chrome_touch_180_percent.gypi'] |
| 301 }, | 300 }, |
| 302 ], | 301 ], |
| 303 'conditions': [ | 302 'conditions': [ |
| 304 ['use_aura==1', { | 303 ['use_aura==1', { |
| 305 'dependencies': [ | 304 'dependencies': [ |
| 306 '<(DEPTH)/ash/ash.gyp:ash_resources', | 305 '<(DEPTH)/ash/ash.gyp:ash_resources', |
| 306 '<(DEPTH)/ash/ash.gyp:ash_wallpaper_resources', |
| 307 ], | 307 ], |
| 308 }], | 308 }], |
| 309 ['OS != "mac"', { | 309 ['OS != "mac"', { |
| 310 # Copy pak files to the product directory. These files will be picked | 310 # Copy pak files to the product directory. These files will be picked |
| 311 # up by the following installer scripts: | 311 # up by the following installer scripts: |
| 312 # - Windows: chrome/installer/mini_installer/chrome.release | 312 # - Windows: chrome/installer/mini_installer/chrome.release |
| 313 # - Linux: chrome/installer/linux/internal/common/installer.include | 313 # - Linux: chrome/installer/linux/internal/common/installer.include |
| 314 # Ensure that the above scripts are updated when adding or removing | 314 # Ensure that the above scripts are updated when adding or removing |
| 315 # pak files. | 315 # pak files. |
| 316 # Copying files to the product directory is not needed on the Mac | 316 # Copying files to the product directory is not needed on the Mac |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 377 ], | 377 ], |
| 378 }, | 378 }, |
| 379 ], | 379 ], |
| 380 }], | 380 }], |
| 381 ], # conditions | 381 ], # conditions |
| 382 }], # end OS != "mac" | 382 }], # end OS != "mac" |
| 383 ], # conditions | 383 ], # conditions |
| 384 }, | 384 }, |
| 385 ], # targets | 385 ], # targets |
| 386 } | 386 } |
| OLD | NEW |