Commit a12daa5a authored by rouslan@chromium.org's avatar rouslan@chromium.org

Check in chrome/app/address_input_strings.grdp.

This patch checks in chrome/app/address_input_strings.grdp and does not
update it in "gclient runhooks".

BUG=327046

Review URL: https://codereview.chromium.org/337163002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278279 0039d316-1c4b-4281-b951-d872f2087c98
parent 345bd207
cpu@chromium.org cpu@chromium.org
per-file address_input_strings.grd*=estade@chromium.org
per-file address_input_strings.grd*=rouslan@chromium.org
per-file bookmarks_strings.grdp=* per-file bookmarks_strings.grdp=*
per-file chromeos_strings.grdp=* per-file chromeos_strings.grdp=*
per-file chromium_strings.grd=* per-file chromium_strings.grd=*
......
This diff is collapsed.
...@@ -115,6 +115,11 @@ def calc_inputs(locale): ...@@ -115,6 +115,11 @@ def calc_inputs(locale):
inputs.append(os.path.join(SHARE_INT_DIR, 'third_party', 'libaddressinput', inputs.append(os.path.join(SHARE_INT_DIR, 'third_party', 'libaddressinput',
'libaddressinput_strings_%s.pak' % locale)) 'libaddressinput_strings_%s.pak' % locale))
#e.g. '<(SHARED_INTERMEDIATE_DIR)/grit/libaddressinput/
# address_input_strings_da.pak',
inputs.append(os.path.join(SHARE_INT_DIR, 'grit', 'libaddressinput',
'address_input_strings_%s.pak' % locale))
#e.g. '<(grit_out_dir)/google_chrome_strings_da.pak' #e.g. '<(grit_out_dir)/google_chrome_strings_da.pak'
# or # or
# '<(grit_out_dir)/chromium_strings_da.pak' # '<(grit_out_dir)/chromium_strings_da.pak'
......
...@@ -14,7 +14,8 @@ HEADER = """<!-- ...@@ -14,7 +14,8 @@ HEADER = """<!--
DO NOT MODIFY. DO NOT MODIFY.
This file is generated by "gclient runhooks" from This file is generated by
third_party/libaddressinput/chromium/tools/update-strings.py from
src/third_party/libaddressinput/src/cpp/res/messages.grdp. Submit modifications src/third_party/libaddressinput/src/cpp/res/messages.grdp. Submit modifications
to the upstream library at https://libaddressinput.googlecode.com/. to the upstream library at https://libaddressinput.googlecode.com/.
......
...@@ -41,6 +41,27 @@ ...@@ -41,6 +41,27 @@
'../../build/grit_target.gypi', '../../build/grit_target.gypi',
], ],
}, },
{
'target_name': 'libaddressinput_updated_strings',
'type': 'none',
'variables': {
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/grit/libaddressinput/',
},
'actions': [
{
'action_name': 'libaddressinput_updated_strings',
'variables': {
'grit_grd_file': '../../chrome/app/address_input_strings.grd',
},
'includes': [
'../../build/grit_action.gypi',
],
},
],
'includes': [
'../../build/grit_target.gypi',
],
},
# This target provides basic functionality which is cooked into the build. # This target provides basic functionality which is cooked into the build.
{ 'target_name': 'libaddressinput_util', { 'target_name': 'libaddressinput_util',
'type': 'static_library', 'type': 'static_library',
...@@ -129,6 +150,7 @@ ...@@ -129,6 +150,7 @@
], ],
'dependencies': [ 'dependencies': [
'libaddressinput_strings', 'libaddressinput_strings',
'libaddressinput_updated_strings',
'libaddressinput_util', 'libaddressinput_util',
'<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:base_i18n', '<(DEPTH)/base/base.gyp:base_i18n',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment