Mojo: Simplify typemap usage.

mojo/android/BUILD.gn

 # 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.
 
 import("//build/config/android/rules.gni")
 
 group("android") {
   testonly = true
   deps = [
     ":mojo_javatests",
@@ skipping 80 matching lines @@
     "javatests/src/org/chromium/mojo/bindings/ValidationTestUtil.java",
     "javatests/src/org/chromium/mojo/bindings/ValidationTestUtilTest.java",
     "javatests/src/org/chromium/mojo/system/impl/CoreImplTest.java",
   ]
 
   deps = [
     ":system_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//mojo/public/interfaces/bindings/tests:test_interfaces_java",
+    "//mojo/public/interfaces/bindings/tests:test_mojom_import2_java",
+    "//mojo/public/interfaces/bindings/tests:test_mojom_import_java",
     "//mojo/public/java:bindings",
     "//mojo/public/java:system",
   ]
 }
 
 shared_library("mojo_java_unittests") {
   testonly = true
 
   sources = [
     "javatests/init_library.cc",
@@ skipping 24 matching lines @@
     ":mojo_javatests",
     ":system_java",
     "//base:base_java",
     "//mojo/public/interfaces/bindings/tests:test_interfaces",
     "//mojo/public/java:bindings",
   ]
   native_libs = [ "libmojo_java_unittests.so" ]
   apk_name = "MojoTest"
   android_manifest = "javatests/AndroidManifest.xml"
 }