Java content handler for Android.

build/config/android/internal_rules.gni

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..cbdc9264c3975819046a2d67aa97111f902af361 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,15 @@ 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 (defined(invoker.main_class)) {
+      args += [
+        "--main-class",
+        invoker.main_class,

[qsr, 2015/02/06 17:16:14]

Why using --manifest-entry=foo for 1 and --main-class bar for the other?
Shouldn't you use the first form for both.

Also, do we really want to support main-class here while we do not use it?

[etiennej, 2015/02/09 14:09:51]

Done.

+      ]
+    }
     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.manifest_entries)) {
+      manifest_entries = invoker.manifest_entries
+    }
+    if (defined(invoker.main_class)) {
+      main_class = invoker.main_class
+    }
   }
 
   if (defined(invoker.main_class)) {