Maintain Android strings in grd files.

build/android/process_resources.py

Index: build/android/process_resources.py
diff --git a/build/android/process_resources.py b/build/android/process_resources.py
index b0a04af22869c5588f512a9667d7844da5dfb09f..afdbdce20b7781406f9f204a377db6886a4db5e0 100755
--- a/build/android/process_resources.py
+++ b/build/android/process_resources.py
@@ -27,7 +27,7 @@ def ParseArgs():
   parser.add_option('--R-package', help='Java package for generated R.java')
   parser.add_option('--R-dir', help='directory to hold generated R.java')
   parser.add_option('--res-dir', help='directory containing resources')
-  parser.add_option('--crunched-res-dir',
+  parser.add_option('--out-res-dir',
                     help='directory to hold crunched resources')
   (options, args) = parser.parse_args()
 
@@ -36,7 +36,7 @@ def ParseArgs():
 
   # Check that required options have been provided.
   required_options = ('android_sdk', 'android_sdk_tools', 'R_package',
-                      'R_dir', 'res_dir', 'crunched_res_dir')
+                      'R_dir', 'res_dir', 'out_res_dir')
   for option_name in required_options:
     if getattr(options, option_name) is None:
       parser.error('--%s is required' % option_name.replace('_', '-'))
@@ -62,6 +62,8 @@ def main():
                          '--custom-package', options.R_package,
                          '-M', dummy_manifest,
                          '-S', options.res_dir,
+                         '-S', options.out_res_dir,
+                         '--auto-add-overlay',

[cjhopman, 2013/02/19 22:57:15]

what's --auto-add-overlay?

[newt (away), 2013/02/20 01:19:36]

According to aapt: "Automatically add resources that are only in overlays."
Helpful, right. What's an overlay again?

aapt assumes that the first -S option specifies the main project's resources,
while subsequent -S options specify resources from library projects... unless
you use --auto-add-overlay, in which case all -S options specify the project's
resources.

                          '-I', android_jar,
                          '--output-text-symbols', options.R_dir,
                          '-J', options.R_dir])
@@ -71,7 +73,7 @@ def main():
   subprocess.check_call([aapt,
                          'crunch',
                          '-S', options.res_dir,
-                         '-C', options.crunched_res_dir])
+                         '-C', options.out_res_dir])
 
 
 if __name__ == '__main__':