Mojo bindings: Fix typemap includes.

mojo/public/interfaces/bindings/tests/BUILD.gn

Index: mojo/public/interfaces/bindings/tests/BUILD.gn
diff --git a/mojo/public/interfaces/bindings/tests/BUILD.gn b/mojo/public/interfaces/bindings/tests/BUILD.gn
index 6e6d24c558144971e344149efa65e41e4d965d60..59154e3d83da6d540e6b1465a5574c1b65fc56d1 100644
--- a/mojo/public/interfaces/bindings/tests/BUILD.gn
+++ b/mojo/public/interfaces/bindings/tests/BUILD.gn
@@ -4,26 +4,29 @@
 
 import("../../../tools/bindings/mojom.gni")
 
+test_interfaces_mojom = [
+  "math_calculator.mojom",
+  "no_module.mojom",
+  "ping_service.mojom",
+  "rect.mojom",
+  "regression_tests.mojom",
+  "sample_factory.mojom",
+  "sample_import.mojom",
+  "sample_import2.mojom",
+  "sample_interfaces.mojom",
+  "sample_service.mojom",
+  "scoping.mojom",
+  "serialization_test_structs.mojom",
+  "test_constants.mojom",
+  "test_native_types.mojom",
+  "test_structs.mojom",
+  "test_sync_methods.mojom",
+  "validation_test_interfaces.mojom",
+]
+
 mojom("test_interfaces") {
   testonly = true
-  sources = [
-    "math_calculator.mojom",
-    "no_module.mojom",
-    "ping_service.mojom",
-    "rect.mojom",
-    "regression_tests.mojom",
-    "sample_factory.mojom",
-    "sample_import.mojom",
-    "sample_import2.mojom",
-    "sample_interfaces.mojom",
-    "sample_service.mojom",
-    "scoping.mojom",
-    "serialization_test_structs.mojom",
-    "test_constants.mojom",
-    "test_structs.mojom",
-    "test_sync_methods.mojom",
-    "validation_test_interfaces.mojom",
-  ]
+  sources = test_interfaces_mojom
 }
 
 mojom("test_struct_traits_interfaces") {
@@ -53,16 +56,14 @@ mojom("test_associated_interfaces") {
 }
 
 mojom("versioning_test_service_interfaces") {
-  # FIXME: Dart packaged applications cannot depend on testonly mojoms.
-  # testonly = true
+  testonly = true
   sources = [
     "versioning_test_service.mojom",
   ]
 }
 
 mojom("versioning_test_client_interfaces") {
-  # FIXME: Dart packaged applications cannot depend on testonly mojoms.
-  # testonly = true
+  testonly = true
   sources = [
     "versioning_test_client.mojom",
   ]
@@ -71,31 +72,19 @@ mojom("versioning_test_client_interfaces") {
 mojom("test_interfaces_chromium") {
   testonly = true
 
-  sources = [
-    "test_native_types.mojom",
-  ]
+  sources = test_interfaces_mojom
 
   variant = "chromium"
   typemaps = [ "chromium_test.typemap" ]
-
-  public_deps = [
-    ":test_interfaces",
-  ]
 }
 
 mojom("test_interfaces_blink") {
   testonly = true
 
-  sources = [
-    "test_native_types.mojom",
-  ]
+  sources = test_interfaces_mojom
 
   variant = "blink"
   typemaps = [ "blink_test.typemap" ]
-
-  public_deps = [
-    ":test_interfaces",
-  ]
 }
 
 mojom("test_wtf_types") {
@@ -117,6 +106,14 @@ mojom("test_wtf_types_blink") {
   variant = "blink"
 }
 
+mojom("test_interfaces_variant_test") {
+  testonly = true
+
+  sources = test_interfaces_mojom
+
+  variant = "variant_test"
+}
+
 mojom("test_variant") {
   testonly = true
 
@@ -125,5 +122,9 @@ mojom("test_variant") {
     "test_variant_import.mojom",
   ]
 
+  public_deps = [
+    ":test_interfaces_variant_test",

[yzshen1, 2016/03/22 20:29:13]

"test_variant" depends on none of those files, I think there is no need to add
this new target.

[Sam McNally, 2016/03/22 21:54:30]

Done.

+  ]
+
   variant = "variant_test"
 }