| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'chromium_code': 1, | 3 'chromium_code': 1, |
| 4 'grit_base_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui', | 4 'grit_base_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui', |
| 5 }, | 5 }, |
| 6 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'ui_strings', | 8 'target_name': 'ui_strings', |
| 9 'type': 'none', | 9 'type': 'none', |
| 10 'actions': [ | 10 'actions': [ |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 }, | 24 }, |
| 25 'includes': [ '../../../build/grit_action.gypi' ], | 25 'includes': [ '../../../build/grit_action.gypi' ], |
| 26 }, | 26 }, |
| 27 ], | 27 ], |
| 28 'direct_dependent_settings': { | 28 'direct_dependent_settings': { |
| 29 'include_dirs': [ | 29 'include_dirs': [ |
| 30 '<(grit_base_out_dir)/app_locale_settings', | 30 '<(grit_base_out_dir)/app_locale_settings', |
| 31 '<(grit_base_out_dir)/ui_strings', | 31 '<(grit_base_out_dir)/ui_strings', |
| 32 ], | 32 ], |
| 33 }, | 33 }, |
| 34 'conditions': [ | |
| 35 ['OS=="win"', { | |
| 36 'dependencies': ['../../../build/win/system.gyp:cygwin'], | |
| 37 }], | |
| 38 ], | |
| 39 }, | 34 }, |
| 40 ], | 35 ], |
| 41 'conditions': [ | 36 'conditions': [ |
| 42 ['os_posix == 1 and OS != "mac"', { | 37 ['os_posix == 1 and OS != "mac"', { |
| 43 'targets': [{ | 38 'targets': [{ |
| 44 'target_name': 'ui_unittest_strings', | 39 'target_name': 'ui_unittest_strings', |
| 45 'type': 'none', | 40 'type': 'none', |
| 46 'variables': { | 41 'variables': { |
| 47 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py', | 42 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py', |
| 48 }, | 43 }, |
| (...skipping 22 matching lines...) Expand all Loading... |
| 71 'destination': '<(PRODUCT_DIR)/ui_unittests_strings', | 66 'destination': '<(PRODUCT_DIR)/ui_unittests_strings', |
| 72 'files': [ | 67 'files': [ |
| 73 '<(grit_base_out_dir)/ui_resources/ui_resources.pak', | 68 '<(grit_base_out_dir)/ui_resources/ui_resources.pak', |
| 74 ], | 69 ], |
| 75 }, | 70 }, |
| 76 ], | 71 ], |
| 77 }], | 72 }], |
| 78 }], | 73 }], |
| 79 ], | 74 ], |
| 80 } | 75 } |
| OLD | NEW |