[Android] Build changes needed for Robolectric 3.0.

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 cafd52cb1528962f20fd8dd5f886adddaa003997..a248e75ef401d5aeb5c701463545db27bde56510 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -1506,6 +1506,23 @@ template("compile_java") {
     _enable_errorprone = invoker.enable_errorprone
   }
 
+  _provider_configurations = []
+  if (defined(invoker.provider_configurations)) {
+    _provider_configurations = invoker.provider_configurations
+  }
+
+  _processors = []
+  _enable_iterface_jars_javac = true
+  if (defined(invoker.processors_javac)) {
+    _processors = invoker.processors_javac
+    _enable_iterface_jars_javac = false

[agrieve, 2016/06/01 16:51:43]

nit: _enable_iterface_jars_javac = _processors == []

+  }
+
+  _processor_args = []
+  if (defined(invoker.processor_args_javac)) {
+    _processor_args = invoker.processor_args_javac
+  }
+
   if (defined(invoker.enable_incremental_javac_override)) {
     # Use invoker-specified override.
     _enable_incremental_javac = invoker.enable_incremental_javac_override
@@ -1568,11 +1585,15 @@ template("compile_java") {
     _rebased_depfile = rebase_path(depfile, root_build_dir)
     args = [
       "--depfile=$_rebased_depfile",
-      "--classpath=@FileArg($_rebased_build_config:javac:interface_classpath)",
       "--jar-path=$_rebased_jar_path",
       "--java-srcjars=$_rebased_java_srcjars",
       "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)",
     ]
+    if (_enable_iterface_jars_javac) {
+      args += [ "--classpath=@FileArg($_rebased_build_config:javac:interface_classpath)" ]
+    } else {
+      args += [ "--classpath=@FileArg($_rebased_build_config:javac:classpath)" ]
+    }
     if (_enable_incremental_javac) {
       args += [ "--incremental" ]
       deps += [ "//third_party/jmake" ]
@@ -1604,6 +1625,15 @@ template("compile_java") {
         "bin/chromium_errorprone",
       ]
     }
+    foreach(e, _provider_configurations) {
+      args += [ "--provider-configuration=" + rebase_path(e, root_build_dir) ]
+    }
+    foreach(e, _processors) {
+      args += [ "--processor=" + e ]
+    }
+    foreach(e, _processor_args) {
+      args += [ "--processor-arg=" + e ]
+    }
     args += rebase_path(_java_files, root_build_dir)
   }
 
@@ -1781,8 +1811,11 @@ template("java_library_impl") {
                              "enable_incremental_javac_override",
                              "jar_excluded_patterns",
                              "manifest_entries",
+                             "processors_javac",
+                             "processor_args_javac",
                              "proguard_config",
                              "proguard_preprocess",
+                             "provider_configurations",
                            ])
     jar_path = _jar_path
     build_config = _build_config