summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authornewt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-26 07:31:57 +0000
committernewt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-26 07:31:57 +0000
commit7dc7681f29d8692d4736f8bb93a536f68f374466 (patch)
tree687cc62325b52f06867d11ece1707eb2bebfe34e /chrome/chrome.gyp
parenta021bb66f63f12a26feb9da7b7c9792da60af543 (diff)
downloadchromium_src-7dc7681f29d8692d4736f8bb93a536f68f374466.zip
chromium_src-7dc7681f29d8692d4736f8bb93a536f68f374466.tar.gz
chromium_src-7dc7681f29d8692d4736f8bb93a536f68f374466.tar.bz2
Generate Android string files from generated_resources.grd.
This enables Android layouts and Java code to use strings from generated_resources.grd directly. Strings tagged with formatter_data="android_java" in generated_resources.grd are used to produce an Android strings xml file. BUG=176069 Review URL: https://chromiumcodereview.appspot.com/12529025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index c8acc25..94407c6 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1085,6 +1085,7 @@
'target_name': 'chrome_java',
'type': 'none',
'dependencies': [
+ 'chrome_resources.gyp:chrome_strings',
'profile_sync_service_model_type_selection_java',
'toolbar_model_security_levels_java',
'../base/base.gyp:base',
@@ -1101,6 +1102,9 @@
'R_package': 'org.chromium.chrome',
'R_package_relpath': 'org/chromium/chrome',
'java_strings_grd': 'android_chrome_strings.grd',
+ # Include xml string files generated from generated_resources.grd
+ 'res_extra_dirs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/java/res'],
+ 'res_extra_files': ['<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_INTERMEDIATE_DIR)/chrome" app/generated_resources.grd)'],
},
'includes': [
'../build/java.gypi',