| 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 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 'includes': ['chrome_repack_chrome_touch_100_percent.gypi'] | 294 'includes': ['chrome_repack_chrome_touch_100_percent.gypi'] |
| 295 }, | 295 }, |
| 296 { | 296 { |
| 297 'includes': ['chrome_repack_chrome_touch_140_percent.gypi'] | 297 'includes': ['chrome_repack_chrome_touch_140_percent.gypi'] |
| 298 }, | 298 }, |
| 299 { | 299 { |
| 300 'includes': ['chrome_repack_chrome_touch_180_percent.gypi'] | 300 'includes': ['chrome_repack_chrome_touch_180_percent.gypi'] |
| 301 }, | 301 }, |
| 302 ], | 302 ], |
| 303 'conditions': [ | 303 'conditions': [ |
| 304 ['use_aura==1', { |
| 305 'dependencies': [ |
| 306 '<(DEPTH)/ash/ash.gyp:ash_resources', |
| 307 ], |
| 308 }], |
| 304 ['OS != "mac"', { | 309 ['OS != "mac"', { |
| 305 # 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 |
| 306 # up by the following installer scripts: | 311 # up by the following installer scripts: |
| 307 # - Windows: chrome/installer/mini_installer/chrome.release | 312 # - Windows: chrome/installer/mini_installer/chrome.release |
| 308 # - Linux: chrome/installer/linux/internal/common/installer.include | 313 # - Linux: chrome/installer/linux/internal/common/installer.include |
| 309 # Ensure that the above scripts are updated when adding or removing | 314 # Ensure that the above scripts are updated when adding or removing |
| 310 # pak files. | 315 # pak files. |
| 311 # 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 |
| 312 # since the framework build phase will copy them into the framework | 317 # since the framework build phase will copy them into the framework |
| 313 # bundle directly. | 318 # bundle directly. |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 ], | 377 ], |
| 373 }, | 378 }, |
| 374 ], | 379 ], |
| 375 }], | 380 }], |
| 376 ], # conditions | 381 ], # conditions |
| 377 }], # end OS != "mac" | 382 }], # end OS != "mac" |
| 378 ], # conditions | 383 ], # conditions |
| 379 }, | 384 }, |
| 380 ], # targets | 385 ], # targets |
| 381 } | 386 } |
| OLD | NEW |