| 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': [ |
| 11 { | 11 { |
| 12 'action_name': 'app_strings', | 12 'action_name': 'ui_strings', |
| 13 'variables': { | 13 'variables': { |
| 14 'grit_grd_file': 'app_strings.grd', | 14 'grit_grd_file': 'ui_strings.grd', |
| 15 'grit_out_dir': '<(grit_base_out_dir)/app_strings', | 15 'grit_out_dir': '<(grit_base_out_dir)/ui_strings', |
| 16 }, | 16 }, |
| 17 'includes': [ '../../../build/grit_action.gypi' ], | 17 'includes': [ '../../../build/grit_action.gypi' ], |
| 18 }, | 18 }, |
| 19 { | 19 { |
| 20 'action_name': 'app_locale_settings', | 20 'action_name': 'app_locale_settings', |
| 21 'variables': { | 21 'variables': { |
| 22 'grit_grd_file': 'app_locale_settings.grd', | 22 'grit_grd_file': 'app_locale_settings.grd', |
| 23 'grit_out_dir': '<(grit_base_out_dir)/app_locale_settings', | 23 'grit_out_dir': '<(grit_base_out_dir)/app_locale_settings', |
| 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)/app_strings', | 31 '<(grit_base_out_dir)/ui_strings', |
| 32 ], | 32 ], |
| 33 }, | 33 }, |
| 34 'conditions': [ | 34 'conditions': [ |
| 35 ['OS=="win"', { | 35 ['OS=="win"', { |
| 36 'dependencies': ['../../../build/win/system.gyp:cygwin'], | 36 'dependencies': ['../../../build/win/system.gyp:cygwin'], |
| 37 }], | 37 }], |
| 38 ], | 38 ], |
| 39 }, | 39 }, |
| 40 ], | 40 ], |
| 41 'conditions': [ | 41 'conditions': [ |
| 42 ['os_posix == 1 and OS != "mac"', { | 42 ['os_posix == 1 and OS != "mac"', { |
| 43 'targets': [{ | 43 'targets': [{ |
| 44 'target_name': 'ui_unittest_strings', | 44 'target_name': 'ui_unittest_strings', |
| 45 'type': 'none', | 45 'type': 'none', |
| 46 'variables': { | 46 'variables': { |
| 47 'repack_path': '<(DEPTH)/tools/data_pack/repack.py', | 47 'repack_path': '<(DEPTH)/tools/data_pack/repack.py', |
| 48 }, | 48 }, |
| 49 'actions': [ | 49 'actions': [ |
| 50 { | 50 { |
| 51 'action_name': 'repack_ui_unittest_strings', | 51 'action_name': 'repack_ui_unittest_strings', |
| 52 'variables': { | 52 'variables': { |
| 53 'pak_inputs': [ | 53 'pak_inputs': [ |
| 54 '<(grit_base_out_dir)/app_strings/app_strings_en-US.pak', | 54 '<(grit_base_out_dir)/ui_strings/ui_strings_en-US.pak', |
| 55 '<(grit_base_out_dir)/app_locale_settings/app_locale_settings_en
-US.pak', | 55 '<(grit_base_out_dir)/app_locale_settings/app_locale_settings_en
-US.pak', |
| 56 ], | 56 ], |
| 57 }, | 57 }, |
| 58 'inputs': [ | 58 'inputs': [ |
| 59 '<(repack_path)', | 59 '<(repack_path)', |
| 60 '<@(pak_inputs)', | 60 '<@(pak_inputs)', |
| 61 ], | 61 ], |
| 62 'outputs': [ | 62 'outputs': [ |
| 63 '<(PRODUCT_DIR)/app_unittests_strings/en-US.pak', | 63 '<(PRODUCT_DIR)/app_unittests_strings/en-US.pak', |
| 64 ], | 64 ], |
| 65 'action': ['python', '<(repack_path)', '<@(_outputs)', | 65 'action': ['python', '<(repack_path)', '<@(_outputs)', |
| 66 '<@(pak_inputs)'], | 66 '<@(pak_inputs)'], |
| 67 }, | 67 }, |
| 68 ], | 68 ], |
| 69 'copies': [ | 69 'copies': [ |
| 70 { | 70 { |
| 71 'destination': '<(PRODUCT_DIR)/app_unittests_strings', | 71 'destination': '<(PRODUCT_DIR)/app_unittests_strings', |
| 72 'files': [ | 72 'files': [ |
| 73 '<(grit_base_out_dir)/ui_resources/ui_resources.pak', | 73 '<(grit_base_out_dir)/ui_resources/ui_resources.pak', |
| 74 ], | 74 ], |
| 75 }, | 75 }, |
| 76 ], | 76 ], |
| 77 }], | 77 }], |
| 78 }], | 78 }], |
| 79 ], | 79 ], |
| 80 } | 80 } |
| OLD | NEW |