diff options
author | James Robinson <jamesr@chromium.org> | 2014-09-30 15:26:52 -0700 |
---|---|---|
committer | James Robinson <jamesr@chromium.org> | 2014-09-30 22:27:41 +0000 |
commit | 145636c494aa8b2ea39eb86f1b9c13f9ee52f3f7 (patch) | |
tree | 1bdd1476e0c283ad508fdcfceac68525cfd77c02 | |
parent | 9f98c0f43025605a15114b4b42c7b1319b72d771 (diff) | |
download | chromium_src-145636c494aa8b2ea39eb86f1b9c13f9ee52f3f7.zip chromium_src-145636c494aa8b2ea39eb86f1b9c13f9ee52f3f7.tar.gz chromium_src-145636c494aa8b2ea39eb86f1b9c13f9ee52f3f7.tar.bz2 |
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}
-rw-r--r-- | build/json_schema_api.gni (renamed from extensions/generated_extensions_api.gni) | 2 | ||||
-rw-r--r-- | build/json_schema_bundle_registration_compile.gypi | 2 | ||||
-rw-r--r-- | build/json_schema_compile.gypi | 2 | ||||
-rw-r--r-- | chrome/common/extensions/api/BUILD.gn | 6 | ||||
-rw-r--r-- | extensions/common/api/BUILD.gn | 6 | ||||
-rw-r--r-- | ui/accessibility/BUILD.gn | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/extensions/generated_extensions_api.gni b/build/json_schema_api.gni index f6f3d1f..5857739 100644 --- a/extensions/generated_extensions_api.gni +++ b/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 index 5a013bc..8c5af4e 100644 --- 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 index 9952e20..6e5727a 100644 --- 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 index c74335f..497a03e 100644 --- a/chrome/common/extensions/api/BUILD.gn +++ b/chrome/common/extensions/api/BUILD.gn @@ -2,11 +2,11 @@ # 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 @@ -14,7 +14,7 @@ generated_extensions_api("api") { } # 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 index 757e3a0..e8b4ac5 100644 --- 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 index 9300120..a95527f 100644 --- 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" |