Support Java resources within content and chrome

build/java_apk.gypi

Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 509dc0e308931c3d6c3edeceaf7b491401893edb..a281061631861e61470c5e59d673c75514192bab 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -24,8 +24,8 @@
 # like:
 #
 # content/shell/android/java/content_shell_apk.xml
-# content/shell/android/java/src/chromium/base/Foo.java
-# content/shell/android/java/src/chromium/base/Bar.java
+# content/shell/android/java/src/org/chromium/base/Foo.java
+# content/shell/android/java/src/org/chromium/base/Bar.java
 #
 # Required variables:
 #  package_name - Used to name the intermediate output directory and in the
@@ -36,6 +36,9 @@
 # Optional/automatic variables:
 #  additional_input_paths - These paths will be included in the 'inputs' list to
 #    ensure that this target is rebuilt when one of these paths changes.
+#  additional_res_dirs - Additional directories containing Android resources.
+#  additional_res_packages - Package names of the R.java files corresponding to
+#    each directory in additional_res_dirs, as a semicolon-separated list.

[cjhopman, 2012/11/09 22:21:30]

This is a list now, not semicolon-separated

[newt (away), 2012/11/09 23:05:35]

Done.

 #  additional_src_dirs - Additional directories with .java files to be compiled
 #    and included in the output of this target.
 #  asset_location - The directory where assets are located (default:
@@ -66,7 +69,9 @@
     'proguard_flags%': '',
     'native_libs_paths': [],
     'manifest_package_name%': 'unknown.package.name',
-    'resource_dir%':'',
+    'resource_dir%': '',
+    'additional_res_dirs': [],
+    'additional_res_packages': [],
   },
   'sources': [
       '<@(native_libs_paths)'
@@ -139,6 +144,8 @@
         '-DINPUT_JARS_PATHS=>(input_jars_paths)',
         '-DPACKAGE_NAME=<(package_name)',
         '-DRESOURCE_DIR=<(resource_dir)',
+        '-DADDITIONAL_RES_DIRS=>(additional_res_dirs)',
+        '-DADDITIONAL_RES_PACKAGES=>(additional_res_packages)',
         '-DAPP_MANIFEST_VERSION_NAME=<(app_manifest_version_name)',
         '-DAPP_MANIFEST_VERSION_CODE=<(app_manifest_version_code)',
         '-DPROGUARD_FLAGS=>(proguard_flags)',