Move json schema compiler target into build/ to match gyp

ui/ and chrome/ should not depend on anything from //extensions. R=brettw@chromium.org Review URL: https://codereview.chromium.org/597713002 Cr-Commit-Position: refs/heads/master@{#297528}
hylschwy · Sep 30, 2014 · 145636c · 145636c
1 parent 9f98c0f
commit 145636c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/extensions/generated_extensions_api.gni → build/json_schema_api.gni b/extensions/generated_extensions_api.gni → build/json_schema_api.gni
@@ -49,7 +49,7 @@
 # The static library target also inherits the visibility and output_name
 # of its invoker.
 
-template("generated_extensions_api") {
+template("json_schema_api") {
   assert(defined(invoker.sources),
          "\"sources\" must be defined for the $target_name template.")
   assert(defined(invoker.root_namespace),

diff --git a/build/json_schema_bundle_registration_compile.gypi b/build/json_schema_bundle_registration_compile.gypi
@@ -35,7 +35,7 @@
   },
   'actions': [
     {
-      # GN version: //extensions/generated_extensions_api.gni
+      # GN version: json_schema_api.gni
       'action_name': 'genapi_bundle_registration',
       'inputs': [
         '<@(generator_files)',

diff --git a/build/json_schema_compile.gypi b/build/json_schema_compile.gypi
@@ -26,7 +26,7 @@
   },
   'rules': [
     {
-      # GN version: //extensions/generated_extensions_api.gni
+      # GN version: json_schema_api.gni
       'rule_name': 'genapi',
       'msvs_external_rule': 1,
       'extension': 'json',

diff --git a/chrome/common/extensions/api/BUILD.gn b/chrome/common/extensions/api/BUILD.gn
@@ -2,19 +2,19 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//extensions/generated_extensions_api.gni")
+import("//build/json_schema_api.gni")
 import("schemas.gni")
 
 # GYP version: chrome/common/extensions/api/api.gyp:chrome_api
-generated_extensions_api("api") {
+json_schema_api("api") {
   schemas = true
   bundle = true
 
   deps = schema_dependencies
 }
 
 # GYP version: chrome/browser/extensions/api/api.gyp:chrome_api_registration
-generated_extensions_api("api_registration") {
+json_schema_api("api_registration") {
   impl_dir = "//chrome/browser/extensions/api"
   bundle_registration = true
 

diff --git a/extensions/common/api/BUILD.gn b/extensions/common/api/BUILD.gn
@@ -2,17 +2,17 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//extensions/generated_extensions_api.gni")
+import("//build/json_schema_api.gni")
 import("schemas.gni")
 
 # GYP version: extensions/common/api/api.gyp:extensions_api
-generated_extensions_api("api") {
+json_schema_api("api") {
   schemas = true
   bundle = true
 }
 
 # GYP version: extensions/browser/api/api_registration.gyp:extensions_api_registration
-generated_extensions_api("api_registration") {
+json_schema_api("api_registration") {
   impl_dir = "//extensions/browser/api"
   bundle_registration = true
 

diff --git a/ui/accessibility/BUILD.gn b/ui/accessibility/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//extensions/generated_extensions_api.gni")
+import("//build/json_schema_api.gni")
 
 component("accessibility") {
   sources = [
@@ -71,7 +71,7 @@ test("accessibility_unittests") {
   ]
 }
 
-generated_extensions_api("ax_gen") {
+json_schema_api("ax_gen") {
   sources = [ "ax_enums.idl" ]
   deps = [ "//base/third_party/dynamic_annotations" ]
   root_namespace = "ui"