Switch StoragePartitionService interface to use url::Origin instead of mojo string.

mojo/public/tools/bindings/mojom.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 mojom_generator_root = "//mojo/public/tools/bindings"
 mojom_generator_script = "$mojom_generator_root/mojom_bindings_generator.py"
 mojom_generator_sources = [
   "$mojom_generator_root/generators/mojom_cpp_generator.py",
   "$mojom_generator_root/generators/mojom_js_generator.py",
   "$mojom_generator_root/generators/mojom_java_generator.py",
@@ skipping 230 matching lines @@
       foreach(d, all_deps) {
         # Resolve the name, so that a target //mojo/something becomes
         # //mojo/something:something and we can append cpp_sources_suffix to
         # get the cpp dependency name.
         full_name = get_label_info(d, "label_no_toolchain")
         deps += [ "${full_name}_${cpp_sources_suffix}" ]
       }
     }
   }
 
-  if (is_android && !defined(invoker.variant)) {
+  if (is_android && !defined(invoker.variant) && !defined(invoker.typemaps)) {
     import("//build/config/android/rules.gni")
 
     java_srcjar_target_name = target_name + "_java_sources"
     action(java_srcjar_target_name) {
       script = "//mojo/public/tools/gn/zip.py"
       inputs = process_file_template(invoker.sources, generator_java_outputs)
       output = "$target_gen_dir/$target_name.srcjar"
       outputs = [
         output,
       ]
@@ skipping 21 matching lines @@
         # //mojo/something:something and we can append "_java" to get the java
         # dependency name.
         full_name = get_label_info(d, "label_no_toolchain")
         deps += [ "${full_name}_java" ]
       }
 
       srcjar_deps = [ ":$java_srcjar_target_name" ]
     }
   }
 }