Generate Android string files from generated_resources.grd.

build/java_apk.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file is meant to be included into a target to provide a rule
 # to build Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 49 matching lines @@
     'proguard_enabled%': 'false',
     'proguard_flags%': '',
     'native_libs_paths': [],
     'jar_name%': 'chromium_apk_<(_target_name).jar',
     'resource_dir%':'',
     'R_package%':'',
     'additional_res_dirs': [],
     'additional_res_packages': [],
     'is_test_apk%': 0,
     'java_strings_grd%': '',
-    'grit_grd_file%': '',
+    'res_grit_files': [],
   },
   'sources': [
       '<@(native_libs_paths)'
   ],
   # Pass the jar path to the apk's "fake" jar target.  This would be better as
   # direct_dependent_settings, but a variable set by a direct_dependent_settings
   # cannot be lifted in a dependent to all_dependent_settings.
   'all_dependent_settings': {
     'variables': {
       'apk_output_jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)',
@@ skipping 27 matching lines @@
       'variables': {
         # We generate R.java in package R_package (in addition to the package
         # listed in the AndroidManifest.xml, which is unavoidable).
         'additional_res_dirs': ['<(DEPTH)/build/android/ant/empty/res'],
         'additional_res_packages': ['<(R_package)'],
         'additional_R_text_files': ['<(PRODUCT_DIR)/<(package_name)/R.txt'],
       },
     }],
     ['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': '',
           },
           'includes': ['../build/grit_action.gypi'],
         },
       ],
     }],
   ],
   'actions': [
     {
       'action_name': 'ant_<(_target_name)',
       'message': 'Building <(_target_name).',
       'inputs': [
         '<(java_in_dir)/AndroidManifest.xml',
         '<(DEPTH)/build/android/ant/chromium-apk.xml',
         '<(DEPTH)/build/android/ant/common.xml',
         '<(DEPTH)/build/android/ant/apk-build.xml',
         # If there is a separate find for additional_src_dirs, it will find the
         # wrong .java files when additional_src_dirs is empty.
         '>!@(find >(java_in_dir) >(additional_src_dirs) -name "*.java")',
         '>@(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=': [],
             'additional_res_packages=': [],
           }
         }],
         ['proguard_enabled == "true" and proguard_flags != ""', {
           'inputs': ['<(java_in_dir)/<(proguard_flags)']
         }]
       ],
@@ skipping 38 matching lines @@
         '-buildfile',
         '<(DEPTH)/build/android/ant/chromium-apk.xml',
 
         # Specify CONFIGURATION_NAME as the target for ant to build. The
         # buildfile will then build the appropriate SDK tools target.
         '<(CONFIGURATION_NAME)',
       ]
     },
   ],
 }