| 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 | 8 |
| 9 'variables': { | 9 'variables': { |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 2456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2467 '<!@pymod_do_main(remoting_copy_locales -o -p <(OS) -x <(copy_output
_dir) <(remoting_locales))' | 2467 '<!@pymod_do_main(remoting_copy_locales -o -p <(OS) -x <(copy_output
_dir) <(remoting_locales))' |
| 2468 ], | 2468 ], |
| 2469 'action': [ | 2469 'action': [ |
| 2470 'python', | 2470 'python', |
| 2471 'tools/build/remoting_copy_locales.py', | 2471 'tools/build/remoting_copy_locales.py', |
| 2472 '-p', '<(OS)', | 2472 '-p', '<(OS)', |
| 2473 '-g', '<(grit_out_dir)', | 2473 '-g', '<(grit_out_dir)', |
| 2474 '-x', '<(copy_output_dir)/.', | 2474 '-x', '<(copy_output_dir)/.', |
| 2475 '<@(remoting_locales)', | 2475 '<@(remoting_locales)', |
| 2476 ], | 2476 ], |
| 2477 # Without this, the /. in the -x command above fails, but only in VS |
| 2478 # builds (because VS puts the command in to a batch file and then |
| 2479 # the normalization and substitution of "...\Release\" cause the |
| 2480 # trailing " to be escaped. |
| 2481 'msvs_cygwin_shell': 1, |
| 2477 } | 2482 } |
| 2478 ], | 2483 ], |
| 2479 'includes': [ '../build/grit_target.gypi' ], | 2484 'includes': [ '../build/grit_target.gypi' ], |
| 2480 }, # end of target 'remoting_resources' | 2485 }, # end of target 'remoting_resources' |
| 2481 | 2486 |
| 2482 { | 2487 { |
| 2483 'target_name': 'remoting_base', | 2488 'target_name': 'remoting_base', |
| 2484 'type': 'static_library', | 2489 'type': 'static_library', |
| 2485 'variables': { 'enable_wexit_time_destructors': 1, }, | 2490 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 2486 'dependencies': [ | 2491 'dependencies': [ |
| (...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3011 '../base/allocator/allocator.gyp:allocator', | 3016 '../base/allocator/allocator.gyp:allocator', |
| 3012 ], | 3017 ], |
| 3013 }, | 3018 }, |
| 3014 ], | 3019 ], |
| 3015 ], | 3020 ], |
| 3016 }], # end of 'toolkit_uses_gtk == 1' | 3021 }], # end of 'toolkit_uses_gtk == 1' |
| 3017 ], # end of 'conditions' | 3022 ], # end of 'conditions' |
| 3018 }, # end of target 'remoting_unittests' | 3023 }, # end of target 'remoting_unittests' |
| 3019 ], # end of targets | 3024 ], # end of targets |
| 3020 } | 3025 } |
| OLD | NEW |