Support Java resources within content and chrome

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',
 #   'type': 'none',
 #   'variables': {
 #     'package_name': 'my_package',
 #     'apk_name': 'MyPackage',
 #     'java_in_dir': 'path/to/package/root',
 #     'resource_dir': 'res',
 #   },
 #   'includes': ['path/to/this/gypi/file'],
 # }
 #
 # Note that this assumes that there's an ant buildfile <package_name>_apk.xml in
 # java_in_dir. So, if you have package_name="content_shell" and
 # java_in_dir="content/shell/android/java" you should have a directory structure
 # 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
 #    names of some output files.
 #  apk_name - The final apk will be named <apk_name>.apk
 #  java_in_dir - The top-level java directory. The src should be in
 #    <java_in_dir>/src.
 # 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:
 #    <PRODUCT_DIR>/<package_name>/assets).
 #  generated_src_dirs - Same as additional_src_dirs except used for .java files
 #    that are generated at build time. This should be set automatically by a
 #    target's dependencies. The .java files in these directories are not
 #    included in the 'inputs' list (unlike additional_src_dirs).
 #  input_jars_paths - The path to jars to be included in the classpath. This
 #    should be filled automatically by depending on the appropriate targets.
@@ skipping 10 matching lines @@
     'additional_input_paths': [],
     'input_jars_paths': [],
     'additional_src_dirs': [],
     'generated_src_dirs': [],
     'app_manifest_version_name%': '<(android_app_version_name)',
     'app_manifest_version_code%': '<(android_app_version_code)',
     'proguard_enabled%': 'false',
     '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)'
   ],
   'rules': [
     {
       'rule_name': 'copy_and_strip_native_libraries',
       'extension': 'so',
       'variables': {
         'stripped_library_path': '<(PRODUCT_DIR)/<(package_name)/libs/<(android_app_abi)/<(RULE_INPUT_ROOT).so',
@@ skipping 52 matching lines @@
         '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)',
         '-DPRODUCT_DIR=<(ant_build_out)',
 
         '-DAPK_NAME=<(apk_name)',
         '-DASSET_DIR=<(asset_location)',
         '-DADDITIONAL_SRC_DIRS=>(additional_src_dirs)',
         '-DGENERATED_SRC_DIRS=>(generated_src_dirs)',
         '-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)',
         '-DPROGUARD_ENABLED=>(proguard_enabled)',
 
         '-Dbasedir=<(java_in_dir)',
         '-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)',
       ]
     },
   ],
 }