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..48b47cf3100733cafa7f365073a862ee21f5b8b9 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 |
| } |
| + _mojo_app = false |
|
qsr
2015/02/05 16:50:07
And here and forward, just have a manifest_entries
etiennej
2015/02/06 16:22:29
Done.
|
| + if (defined(invoker.mojo_app)) { |
| + _mojo_app = invoker.mojo_app |
| + } |
| _srcjar_deps = [] |
| if (defined(invoker.srcjar_deps)) { |
| @@ -718,6 +722,15 @@ template("compile_java") { |
| "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)", |
| "--jar-excluded-classes=$_jar_excluded_patterns", |
| ] |
| + if (_mojo_app) { |
| + args += [ "--mojo-jar=1" ] |
| + } |
| + if (defined(invoker.main_class)) { |
| + args += [ |
| + "--main-class", |
| + invoker.main_class, |
| + ] |
| + } |
| if (_chromium_code) { |
| args += [ "--chromium-code=1" ] |
| } |
| @@ -861,6 +874,12 @@ template("java_library_impl") { |
| if (defined(invoker.dist_jar_path)) { |
| dist_jar_path = invoker.dist_jar_path |
| } |
| + if (defined(invoker.mojo_app)) { |
| + mojo_app = invoker.mojo_app |
| + } |
| + if (defined(invoker.main_class)) { |
| + main_class = invoker.main_class |
| + } |
| } |
| if (defined(invoker.main_class)) { |