Generate Android string files from generated_resources.grd.

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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=190573

[newt (away), 2013-03-18 23:24:51]

ready for review

[newt (away), 2013-03-18 23:26:04]

+yfriedman

[cjhopman, 2013-03-19 20:27:37]

lgtm

https://codereview.chromium.org/12529025/diff/2001/build/android/process_reso...
File build/android/process_resources.py (right):

https://codereview.chromium.org/12529025/diff/2001/build/android/process_reso...
build/android/process_resources.py:77: '-J', options.R_dir] + res_dirs_args
Maybe break before the + like below

[newt (away), 2013-03-19 21:26:44]

+nico for chrome.gyp changes

[Nico, 2013-03-19 21:33:04]

lgtm

Since you're here: I cleaned up our grd resources a bit recently, and I noticed
that there are some resources that are checked in to the chromium repo but are
apparently not used by any downstream chrome/android files.

Do you intend to keep strings that are only used upstream in the downstream grd
files, or should these strings move upstream?

(See the output of chrome/tools/check_grd_for_unused_strings.py for examples)

[newt (away), 2013-03-19 22:09:34]

These strings should move. I just checked and only one string actually matches
this criterion right now: IDS_FIRSTRUN_TOS_EXPLANATION. I'll be moving it in the
near future.

[newt (away), 2013-03-20 02:35:08]

@yfriedman: PTAL, thanks!

[Yaron, 2013-03-20 18:18:02]

rubberstamp lgtm

[commit-bot: I haz the power, 2013-03-20 19:32:42]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/newt@chromium.org/12529025/12001

[commit-bot: I haz the power, 2013-03-20 19:32:48]

Failed to apply patch for build/java_apk.gypi:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/java_apk.gypi
  Hunk #1 FAILED at 67.
  Hunk #2 succeeded at 118 (offset 3 lines).
  Hunk #3 FAILED at 150.
  2 out of 3 hunks FAILED -- saving rejects to file build/java_apk.gypi.rej

Patch:       build/java_apk.gypi
Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index
042bfd746ef206dcb3ad385566155e28644fe5d9..8dcc9f39ced30d7ee57a5d51c422375b41e38942
100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -67,7 +67,7 @@
     'additional_res_packages': [],
     'is_test_apk%': 0,
     'java_strings_grd%': '',
-    'grit_grd_file%': '',
+    'res_grit_files': [],
   },
   'sources': [
       '<@(native_libs_paths)'
@@ -115,16 +115,18 @@
     }],
     ['java_strings_grd != ""', {
       'variables': {
-        'out_res_dir': '<(SHARED_INTERMEDIATE_DIR)/<(package_name)_apk/res',
-        'additional_res_dirs': ['<(out_res_dir)'],
+        'res_grit_dir':
'<(SHARED_INTERMEDIATE_DIR)/<(package_name)_apk/res_grit',
+        'additional_res_dirs': ['<(res_grit_dir)'],
         # grit_grd_file is used by grit_action.gypi, included below.
         'grit_grd_file': '<(java_in_dir)/strings/<(java_strings_grd)',
+        'res_grit_files': ['<!@pymod_do_main(grit_info <@(grit_defines)
--outputs "<(res_grit_dir)" <(grit_grd_file))'],
       },
       'actions': [
         {
           'action_name': 'generate_localized_strings_xml',
           'variables': {
-            'grit_out_dir': '<(out_res_dir)',
+            'grit_additional_defines': ['-E',
'ANDROID_JAVA_TAGGED_ONLY=false'],
+            'grit_out_dir': '<(res_grit_dir)',
             # resource_ids is unneeded since we don't generate .h headers.
             'grit_resource_ids': '',
           },
@@ -148,19 +150,12 @@
         '>@(input_jars_paths)',
         '>@(native_libs_paths)',
         '>@(additional_input_paths)',
+        '<@(res_grit_files)',
       ],
       'conditions': [
         ['resource_dir!=""', {
           'inputs': ['<!@(find <(java_in_dir)/<(resource_dir) -name "*")']
         }],
-        ['java_strings_grd != ""', {
-          'inputs': [
-            # TODO(newt): replace this with .../values/strings.xml once
-            # the English strings.xml is generated as well? That would be
-            # simpler and faster and should be equivalent.
-            '<!@pymod_do_main(grit_info <@(grit_defines) --outputs
"<(out_res_dir)" <(grit_grd_file))',
-          ],
-        }],
         ['is_test_apk == 1', {
           'variables': {
             'additional_res_dirs=': [],

[commit-bot: I haz the power, 2013-03-20 20:32:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/newt@chromium.org/12529025/25002

[newt (away), 2013-03-21 18:47:19]

this is blocked on https://codereview.chromium.org/12609013/ which fixes
resource issues in webview

[commit-bot: I haz the power, 2013-03-26 01:15:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/newt@chromium.org/12529025/74001

[commit-bot: I haz the power, 2013-03-26 06:52:21]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/newt@chromium.org/12529025/74001

[commit-bot: I haz the power, 2013-03-26 07:31:58]

Change committed as 190573