Chromium Code Reviews| Index: build/config/android/internal_rules.gni |
| diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni |
| index 125aa2cd17cb0eb71a62c41437046bd9a4acc642..cd60d887db62aef3646f4be6b5d16c4dc6b056c6 100644 |
| --- a/build/config/android/internal_rules.gni |
| +++ b/build/config/android/internal_rules.gni |
| @@ -665,6 +665,10 @@ template("compile_java") { |
| if (defined(invoker.chromium_code)) { |
| _chromium_code = invoker.chromium_code |
| } |
| + _manifest_entries = [] |
| + if (defined(invoker.manifest_entries)) { |
| + _manifest_entries = invoker.manifest_entries |
| + } |
| _srcjar_deps = [] |
| if (defined(invoker.srcjar_deps)) { |
| @@ -718,6 +722,9 @@ template("compile_java") { |
| "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)", |
| "--jar-excluded-classes=$_jar_excluded_patterns", |
| ] |
| + foreach(e, _manifest_entries) { |
| + args += [ "--manifest-entry=" + e ] |
| + } |
| if (_chromium_code) { |
| args += [ "--chromium-code=1" ] |
| } |
| @@ -861,6 +868,12 @@ template("java_library_impl") { |
| if (defined(invoker.dist_jar_path)) { |
| dist_jar_path = invoker.dist_jar_path |
| } |
| + if (defined(invoker.manifest_entries)) { |
| + manifest_entries = invoker.manifest_entries |
| + } |
| + if (defined(invoker.main_class)) { |
| + main_class = invoker.main_class |
|
qsr
2015/02/10 11:58:18
Is main_class is used? If not, you can remove it.
etiennej
2015/02/10 14:32:04
Done.
|
| + } |
| } |
| if (defined(invoker.main_class)) { |