| Index: build/config/android/internal_rules.gni
|
| diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
|
| index 539fbd7b973c6dd12780e1649e85dc22fd91778c..a989912bf6f0b84477b323a440951c732d2f020c 100644
|
| --- a/build/config/android/internal_rules.gni
|
| +++ b/build/config/android/internal_rules.gni
|
| @@ -2049,8 +2049,11 @@ if (enable_java_templates) {
|
| foreach(e, _processor_args) {
|
| args += [ "--processor-arg=" + e ]
|
| }
|
| - foreach(e, _additional_jar_files) {
|
| - args += [ "--additional-jar-file=" + e ]
|
| + foreach(file_tuple, _additional_jar_files) {
|
| + # Each element is of length two, [ path_to_file, path_to_put_in_jar ]
|
| + inputs += [ file_tuple[0] ]
|
| + args +=
|
| + [ "--additional-jar-file=" + file_tuple[0] + ":" + file_tuple[1] ]
|
| }
|
| if (invoker.java_files != []) {
|
| args += [ "@" + rebase_path(invoker.java_sources_file, root_build_dir) ]
|
|
|