[Extensions Schema Compiler] Extract C++ Type Generation

Extract C++ type generation from the json_schema_api gni
template into a separate generate_types gni template. This has the
advantage of cleaning up which arguments are necessary and used for
the template, as well as being able to isolate the different
generation steps (which may have different dependencies or
dependents).

As part of this, introduce separate "bulk" `api` targets in each
of the API directories, which each dependent can depend on. This
obviates the need to depend on e.g. `api` and `api_registration`.

A follow up will break up the JSON string generation bundle and the
extension function registration bundle.

Bug: 864576

Change-Id: I50a1fbe059ec5b7d73c405b230a221c1c6ce3af1
Reviewed-on: https://chromium-review.googlesource.com/1150930
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: Luke Halliwell <halliwell@chromium.org>
Reviewed-by: Albert Chaulk <achaulk@chromium.org>
Reviewed-by: Istiaque Ahmed <lazyboy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580799}

chrome/common/extensions/api/BUILD.gn

@@ -12,9 +12,10 @@ import("//tools/json_schema_compiler/json_schema_api.gni")
 
 assert(enable_extensions)
 
-json_schema_api("api") {
+# TODO(devlin): Enforce visibility restrictions on more of these targets?
+
+json_schema_api("generated_api_bundles") {
   sources = chrome_extensions_api_schema_sources
-  schemas = true
   bundle = true
   configs = [ "//build/config:precompiled_headers" ]
   bundle_name = "Chrome"
@@ -48,6 +49,21 @@ json_schema_api("api") {
   deps = [
     "//extensions/common/api",
   ]
+
+  visibility = [ ":api" ]
+}
+
+generated_types("generated_api_types") {
+  sources = chrome_extensions_api_schema_sources
+  configs = [ "//build/config:precompiled_headers" ]
+  schema_include_rules = chrome_extensions_api_schema_include_rules
+
+  root_namespace = chrome_extensions_api_root_namespace
+  deps = [
+    "//extensions/common/api",
+  ]
+
+  visibility = [ ":api" ]
 }
 
 json_features("api_features") {
@@ -74,6 +90,15 @@ json_features("manifest_features") {
   ]
 }
 
+# Public Targets
+
+group("api") {
+  public_deps = [
+    ":generated_api_bundles",
+    ":generated_api_types",
+  ]
+}
+
 group("extensions_features") {
   public_deps = [
     ":api_features",

chromecast/browser/BUILD.gn

@@ -308,7 +308,6 @@ cast_source_set("browser") {
 
     deps += [
       "//chromecast/common/extensions_api:api",
-      "//chromecast/common/extensions_api:api_registration",
       "//components/guest_view/browser",
       "//components/keyed_service/content",
       "//components/pref_registry",

chromecast/common/BUILD.gn

@@ -42,12 +42,11 @@ cast_source_set("common") {
 
     deps += [
       "//chromecast/common/extensions_api:api",
-      "//chromecast/common/extensions_api:api_registration",
       "//chromecast/common/extensions_api:extensions_features",
       "//components/version_info",
       "//extensions:extensions_resources_grd_grit",
       "//extensions/common",
-      "//extensions/common/api:generated_api",
+      "//extensions/common/api",
       "//extensions/shell:resources",
       "//extensions/shell:resources_grit",
     ]

chromecast/common/extensions_api/BUILD.gn

@@ -31,10 +31,9 @@ root_namespace = "extensions::cast::api::%(namespace)s"
 
 extensions_api_uncompiled_sources = [ "extension.json" ]
 
-json_schema_api("api") {
+json_schema_api("generated_api_strings_bundle") {
   sources = schema_sources
   uncompiled_sources = extensions_api_uncompiled_sources
-  schemas = true
   bundle = true
   bundle_name = "Cast"
   uncompiled_bundle_schema_sources = [ "tts.json" ]
@@ -43,19 +42,30 @@ json_schema_api("api") {
   deps = [
     "//extensions/common/api",
   ]
+  visibility = [ ":api" ]
 }
 
-json_schema_api("api_registration") {
+json_schema_api("generated_api_registration_bundle") {
   sources = schema_sources
   impl_dir = "//chromecast/browser/extensions/api"
   bundle_registration = true
   bundle_name = "Cast"
 
   deps = [
-    ":api",
     "//extensions/common",
     "//extensions/common/api",
   ]
+  visibility = [ ":api" ]
+}
+
+generated_types("generated_api_types") {
+  sources = schema_sources
+  schema_include_rules = extensions_api_schema_include_rules
+
+  deps = [
+    "//extensions/common/api",
+  ]
+  visibility = [ ":api" ]
 }
 
 json_features("cast_api_features") {
@@ -82,6 +92,16 @@ json_features("cast_manifest_features") {
   ]
 }
 
+# Public Targets
+
+group("api") {
+  public_deps = [
+    ":generated_api_registration_bundle",
+    ":generated_api_strings_bundle",
+    ":generated_api_types",
+  ]
+}
+
 group("extensions_features") {
   public_deps = [
     ":cast_api_features",

extensions/common/api/BUILD.gn

@@ -11,9 +11,10 @@ import("//tools/json_schema_compiler/json_schema_api.gni")
 
 assert(enable_extensions)
 
-json_schema_api("generated_api") {
+# TODO(devlin): Enforce visibility restrictions on more of these targets?
+
+json_schema_api("generated_api_bundles") {
   sources = extensions_api_schema_files
-  schemas = true
   bundle = true
   bundle_name = ""
   root_namespace = extensions_api_root_namespace
@@ -24,19 +25,22 @@ json_schema_api("generated_api") {
     "//base",
     "//extensions/buildflags",
   ]
+  visibility = [ ":api" ]
 }
 
-mojom("mojom") {
-  sources = [
-    "mime_handler.mojom",
+generated_types("generated_api_types") {
+  sources = extensions_api_schema_files
+  root_namespace = extensions_api_root_namespace
+  deps = [
+    "//base",
+    "//extensions/buildflags",
   ]
+  visibility = [ ":api" ]
 }
 
-group("api") {
-  public_deps = [
-    ":generated_api",
-    ":mojom",
-    "//extensions/buildflags",
+mojom("mojom") {
+  sources = [
+    "mime_handler.mojom",
   ]
 }
 
@@ -72,6 +76,17 @@ json_features("behavior_features") {
   ]
 }
 
+# Public Targets
+
+group("api") {
+  public_deps = [
+    ":generated_api_bundles",
+    ":generated_api_types",
+    ":mojom",
+    "//extensions/buildflags",
+  ]
+}
+
 group("extensions_features") {
   public_deps = [
     ":api_features",

extensions/shell/BUILD.gn

@@ -65,7 +65,6 @@ source_set("app_shell_lib") {
     "//extensions/renderer",
     "//extensions/shell/browser/system_logs",
     "//extensions/shell/common/api",
-    "//extensions/shell/common/api:api_registration",
     "//extensions/shell/common/api:extensions_features",
     "//google_apis",
     "//third_party/blink/public:blink",

extensions/shell/common/api/BUILD.gn

@@ -9,26 +9,36 @@ import("//tools/json_schema_compiler/json_schema_api.gni")
 assert(enable_extensions,
        "Cannot depend on extensions because enable_extensions=false.")
 
+# TODO(devlin): Enforce visibility restrictions on more of these targets?
+
 schema_sources = [ "identity.idl" ]
 root_namespace = "extensions::shell::api::%(namespace)s"
 
-json_schema_api("api") {
-  sources = schema_sources
-  schemas = true
-  bundle = true
-  bundle_name = "Shell"
-}
-
-json_schema_api("api_registration") {
+json_schema_api("generated_api_registration_bundle") {
   sources = schema_sources
   impl_dir = "//extensions/shell/browser/api"
   bundle_registration = true
   bundle_name = "Shell"
 
   deps = [
-    ":api",
     "//extensions/common",
   ]
+
+  visibility = [ ":api" ]
+}
+
+json_schema_api("generated_api_strings_bundle") {
+  sources = schema_sources
+  bundle = true
+  bundle_name = "Shell"
+
+  visibility = [ ":api" ]
+}
+
+generated_types("generated_api_types") {
+  sources = schema_sources
+
+  visibility = [ ":api" ]
 }
 
 json_features("shell_api_features") {
@@ -39,6 +49,16 @@ json_features("shell_api_features") {
   ]
 }
 
+# Public Targets
+
+group("api") {
+  public_deps = [
+    ":generated_api_registration_bundle",
+    ":generated_api_strings_bundle",
+    ":generated_api_types",
+  ]
+}
+
 group("extensions_features") {
   public_deps = [
     ":shell_api_features",

tools/json_schema_compiler/test/BUILD.gn

@@ -9,7 +9,7 @@ import("//tools/json_schema_compiler/json_schema_api.gni")
 
 assert(enable_extensions)
 
-json_schema_api("api") {
+generated_types("generated_types") {
   visibility = [ ":*" ]
 
   sources = [
@@ -34,7 +34,6 @@ json_schema_api("api") {
     "simple_api.json",
   ]
 
-  schemas = true
   root_namespace = "test::api::%(namespace)s"
 
   deps = [
@@ -79,7 +78,7 @@ source_set("unit_tests") {
   ]
 
   deps = [
-    ":api",
+    ":generated_types",
     "//base",
     "//testing/gtest",
   ]