Chromium Code Reviews| 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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 211 'includes': [ '../build/grit_action.gypi' ], | 211 'includes': [ '../build/grit_action.gypi' ], |
| 212 }, | 212 }, |
| 213 { | 213 { |
| 214 'action_name': 'theme_resources_standard', | 214 'action_name': 'theme_resources_standard', |
| 215 'variables': { | 215 'variables': { |
| 216 'grit_grd_file': 'app/theme/theme_resources_standard.grd', | 216 'grit_grd_file': 'app/theme/theme_resources_standard.grd', |
| 217 }, | 217 }, |
| 218 'includes': [ '../build/grit_action.gypi' ], | 218 'includes': [ '../build/grit_action.gypi' ], |
| 219 }, | 219 }, |
| 220 { | 220 { |
| 221 'action_name': 'theme_resources_metro_1x', | 221 'action_name': 'theme_resources_touch_1x', |
| 222 'variables': { | 222 'variables': { |
| 223 'grit_grd_file': 'app/theme/theme_resources_metro_1x.grd', | 223 'grit_grd_file': 'app/theme/theme_resources_touch_1x.grd', |
| 224 }, | 224 }, |
| 225 'includes': [ '../build/grit_action.gypi' ], | 225 'includes': [ '../build/grit_action.gypi' ], |
| 226 }, | 226 }, |
| 227 ], | 227 ], |
| 228 'includes': [ '../build/grit_target.gypi' ], | 228 'includes': [ '../build/grit_target.gypi' ], |
| 229 }, | 229 }, |
| 230 { | 230 { |
| 231 'target_name': 'theme_resources', | 231 'target_name': 'theme_resources', |
| 232 'type': 'none', | 232 'type': 'none', |
| 233 'dependencies': [ | 233 'dependencies': [ |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 271 'copies': [ | 271 'copies': [ |
| 272 { | 272 { |
| 273 'destination': '<(PRODUCT_DIR)', | 273 'destination': '<(PRODUCT_DIR)', |
| 274 'files': [ | 274 'files': [ |
| 275 '<(grit_out_dir)/theme_resources_2x.pak', | 275 '<(grit_out_dir)/theme_resources_2x.pak', |
| 276 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x/ui_resources_2x.p ak', | 276 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x/ui_resources_2x.p ak', |
| 277 ], | 277 ], |
| 278 }, | 278 }, |
| 279 ], | 279 ], |
| 280 }], | 280 }], |
| 281 ['enable_metro == 1', { | 281 # Touch enabled platforms. |
| 282 ['enable_metro == 1 or use_ash == 1', { | |
|
sky
2012/04/30 22:43:48
I don't know how pervasive enable_metro is. Would
James Cook
2012/04/30 22:55:29
Oops, that wasn't supposed to be part of this CL.
| |
| 282 'copies': [ | 283 'copies': [ |
| 283 { | 284 { |
| 284 'destination': '<(PRODUCT_DIR)', | 285 'destination': '<(PRODUCT_DIR)', |
| 285 'files': [ | 286 'files': [ |
| 286 '<(grit_out_dir)/theme_resources_metro_1x.pak', | 287 '<(grit_out_dir)/theme_resources_touch_1x.pak', |
| 287 ], | 288 ], |
| 288 }, | 289 }, |
| 289 ], | 290 ], |
| 290 }], | 291 }], |
| 291 ], | 292 ], |
| 292 }, | 293 }, |
| 293 { | 294 { |
| 294 'target_name': 'packed_extra_resources', | 295 'target_name': 'packed_extra_resources', |
| 295 'type': 'none', | 296 'type': 'none', |
| 296 'variables': { | 297 'variables': { |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 390 'files': ['<@(default_apps_list)'] | 391 'files': ['<@(default_apps_list)'] |
| 391 }, | 392 }, |
| 392 ], | 393 ], |
| 393 }], | 394 }], |
| 394 ], # conditions | 395 ], # conditions |
| 395 }], # end OS != "mac" | 396 }], # end OS != "mac" |
| 396 ], # conditions | 397 ], # conditions |
| 397 }, | 398 }, |
| 398 ], # targets | 399 ], # targets |
| 399 } | 400 } |
| OLD | NEW |