| Index: build/android/java_cpp_template.gypi
|
| diff --git a/build/android/java_cpp_template.gypi b/build/android/java_cpp_template.gypi
|
| index fe4238af84fd700979748a2d62bba311d4fc5435..036f32cf5af67e805edf7c710bdfd4b178bad3e1 100644
|
| --- a/build/android/java_cpp_template.gypi
|
| +++ b/build/android/java_cpp_template.gypi
|
| @@ -22,8 +22,8 @@
|
| #
|
| # The 'sources' entry should only list template file. The template file
|
| # itself should use the 'ClassName.template' format, and will generate
|
| -# 'gen/templates/<package-name>/ClassName.java. The files which template
|
| -# dependents on and typically included by the template should be listed
|
| +# 'gen/templates/<target-name>/<package-name>/ClassName.java. The files which
|
| +# template dependents on and typically included by the template should be listed
|
| # in template_deps variables. Any change to them will force a rebuild of
|
| # the template, and hence of any source that depends on it.
|
| #
|
| @@ -32,7 +32,7 @@
|
| # Location where all generated Java sources will be placed.
|
| 'variables': {
|
| 'include_path%': '<(DEPTH)',
|
| - 'output_dir': '<(SHARED_INTERMEDIATE_DIR)/templates/<(package_name)',
|
| + 'output_dir': '<(SHARED_INTERMEDIATE_DIR)/templates/<(_target_name)/<(package_name)',
|
| },
|
| 'direct_dependent_settings': {
|
| 'variables': {
|
|
|