Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 # TODO(jochen): make this a .gypi file and include it in content.gyp, once | 5 # TODO(jochen): make this a .gypi file and include it in content.gyp, once |
| 6 # content.gyp doesn't depend on gyp files from chrome/ anymore: | 6 # content.gyp doesn't depend on gyp files from chrome/ anymore: |
| 7 # http://crbug.com/10394 | 7 # http://crbug.com/10394 |
| 8 { | 8 { |
| 9 'variables': { | 9 'variables': { |
| 10 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content', | 10 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content', |
| 11 }, | 11 }, |
| 12 'targets': [ | 12 'targets': [ |
| 13 { | 13 { |
| 14 'target_name': 'content_resources', | 14 'target_name': 'content_resources', |
| 15 'type': 'none', | 15 'type': 'none', |
| 16 'dependencies': [ | |
| 17 'generate_content_resources', | |
| 18 ], | |
| 19 'copies': [ | |
| 20 { | |
| 21 'destination': '<(PRODUCT_DIR)', | |
| 22 'files': [ | |
| 23 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak' | |
| 24 ], | |
| 25 }, | |
| 26 ], | |
| 27 }, | |
| 28 { | |
| 29 'target_name': 'generate_content_resources', | |
| 30 'type': 'none', | |
| 16 'actions': [ | 31 'actions': [ |
| 17 { | 32 { |
| 18 'action_name': 'content_resources', | 33 'action_name': 'content_resources', |
| 19 'variables': { | 34 'variables': { |
| 20 'grit_grd_file': 'content_resources.grd', | 35 'grit_grd_file': 'content_resources.grd', |
| 21 }, | 36 }, |
| 22 'includes': [ '../build/grit_action.gypi' ], | 37 'includes': [ '../build/grit_action.gypi' ], |
| 23 }, | 38 }, |
| 24 ], | 39 ], |
| 25 'includes': [ '../build/grit_target.gypi' ], | 40 'includes': [ '../build/grit_target.gypi' ], |
|
bradn
2012/02/29 23:16:34
I think your try job is failing because you'll nee
Myles C. Maxfield
2012/02/29 23:36:46
Done.
| |
| 26 'copies': [ | |
| 27 { | |
| 28 'destination': '<(PRODUCT_DIR)', | |
| 29 'files': [ | |
| 30 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak' | |
| 31 ], | |
| 32 }, | |
| 33 ], | |
| 34 }, | 41 }, |
| 35 ], | 42 ], |
| 36 } | 43 } |
| OLD | NEW |