Commit 7e2d8443 authored by brettw@chromium.org's avatar brettw@chromium.org

Convert GN visibility to lists.

GN visibility currently allows either string or list types, but this is causing
some problems for some templates. I'm going to require it to be lists, so am
changing all callers before pushing the new binary.

Review URL: https://codereview.chromium.org/550333003

git-svn-id: svn://svn.chromium.org/blink/trunk@181583 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent ab2f5695
...@@ -7,7 +7,7 @@ if (is_clang) { ...@@ -7,7 +7,7 @@ if (is_clang) {
import("//build/config/clang/clang.gni") import("//build/config/clang/clang.gni")
} }
visibility = "//third_party/WebKit/*" visibility = [ "//third_party/WebKit/*" ]
# features --------------------------------------------------------------------- # features ---------------------------------------------------------------------
......
...@@ -7,7 +7,7 @@ import("//third_party/WebKit/Source/build/scripts/scripts.gni") ...@@ -7,7 +7,7 @@ import("//third_party/WebKit/Source/build/scripts/scripts.gni")
import("//third_party/WebKit/Source/core/core.gni") import("//third_party/WebKit/Source/core/core.gni")
import("//third_party/WebKit/Source/modules/modules.gni") import("//third_party/WebKit/Source/modules/modules.gni")
visibility = "//third_party/WebKit/*" visibility = [ "//third_party/WebKit/*" ]
# Main interface IDL files (excluding dependencies and testing) # Main interface IDL files (excluding dependencies and testing)
# are included as properties on global objects, and in aggregate bindings. # are included as properties on global objects, and in aggregate bindings.
......
...@@ -6,7 +6,7 @@ import("//third_party/WebKit/Source/bindings/core/core.gni") ...@@ -6,7 +6,7 @@ import("//third_party/WebKit/Source/bindings/core/core.gni")
import("//third_party/WebKit/Source/bindings/core/idl.gni") import("//third_party/WebKit/Source/bindings/core/idl.gni")
import("//third_party/WebKit/Source/bindings/scripts/scripts.gni") import("//third_party/WebKit/Source/bindings/scripts/scripts.gni")
visibility = "//third_party/WebKit/*" visibility = [ "//third_party/WebKit/*" ]
# GYP version: Source/bindings/core/generated.gyp:interfaces_info_individual_core # GYP version: Source/bindings/core/generated.gyp:interfaces_info_individual_core
compute_interfaces_info_individual("interfaces_info_individual_core") { compute_interfaces_info_individual("interfaces_info_individual_core") {
......
...@@ -8,7 +8,7 @@ import("//third_party/WebKit/Source/bindings/core/v8/generated.gni") ...@@ -8,7 +8,7 @@ import("//third_party/WebKit/Source/bindings/core/v8/generated.gni")
import("//third_party/WebKit/Source/bindings/scripts/scripts.gni") import("//third_party/WebKit/Source/bindings/scripts/scripts.gni")
import("//third_party/WebKit/Source/core/core.gni") import("//third_party/WebKit/Source/core/core.gni")
visibility = "//third_party/WebKit/Source/*" visibility = [ "//third_party/WebKit/Source/*" ]
# bindings_core_v8_generated in core/v8/generated.gyp # bindings_core_v8_generated in core/v8/generated.gyp
group("bindings_core_v8_generated") { group("bindings_core_v8_generated") {
......
...@@ -8,7 +8,7 @@ import("//third_party/WebKit/Source/bindings/modules/modules.gni") ...@@ -8,7 +8,7 @@ import("//third_party/WebKit/Source/bindings/modules/modules.gni")
import("//third_party/WebKit/Source/bindings/scripts/scripts.gni") import("//third_party/WebKit/Source/bindings/scripts/scripts.gni")
import("//third_party/WebKit/Source/build/scripts/scripts.gni") import("//third_party/WebKit/Source/build/scripts/scripts.gni")
visibility = "//third_party/WebKit/*" visibility = [ "//third_party/WebKit/*" ]
# GYP version: Source/bindings/modules/generated.gyp:bindings_modules_generated # GYP version: Source/bindings/modules/generated.gyp:bindings_modules_generated
group("bindings_modules_generated") { group("bindings_modules_generated") {
......
...@@ -6,7 +6,7 @@ import("//third_party/WebKit/Source/bindings/modules/v8/generated.gni") ...@@ -6,7 +6,7 @@ import("//third_party/WebKit/Source/bindings/modules/v8/generated.gni")
import("//third_party/WebKit/Source/bindings/scripts/scripts.gni") import("//third_party/WebKit/Source/bindings/scripts/scripts.gni")
import("//third_party/WebKit/Source/modules/modules.gni") import("//third_party/WebKit/Source/modules/modules.gni")
visibility = "//third_party/WebKit/*" visibility = [ "//third_party/WebKit/*" ]
# bindings_modules_generated in modules/v8/generated.gyp # bindings_modules_generated in modules/v8/generated.gyp
group("bindings_modules_generated") { group("bindings_modules_generated") {
......
...@@ -6,7 +6,7 @@ import("//third_party/WebKit/Source/bindings/bindings.gni") ...@@ -6,7 +6,7 @@ import("//third_party/WebKit/Source/bindings/bindings.gni")
import("//third_party/WebKit/Source/bindings/scripts/scripts.gni") import("//third_party/WebKit/Source/bindings/scripts/scripts.gni")
import("//third_party/WebKit/Source/bindings/templates/templates.gni") import("//third_party/WebKit/Source/bindings/templates/templates.gni")
visibility = "//third_party/WebKit/*" visibility = [ "//third_party/WebKit/*" ]
# This separate pre-caching step is required to use lex/parse table # This separate pre-caching step is required to use lex/parse table
# caching in PLY, since PLY itself does not check if the cache is # caching in PLY, since PLY itself does not check if the cache is
......
...@@ -13,7 +13,7 @@ import("//third_party/WebKit/Source/core/core.gni") ...@@ -13,7 +13,7 @@ import("//third_party/WebKit/Source/core/core.gni")
import("//third_party/WebKit/Source/build/scripts/scripts.gni") import("//third_party/WebKit/Source/build/scripts/scripts.gni")
import("//third_party/WebKit/Source/platform/platform_generated.gni") import("//third_party/WebKit/Source/platform/platform_generated.gni")
visibility = "//third_party/WebKit/Source/*" visibility = [ "//third_party/WebKit/Source/*" ]
rel_blink_core_gen_dir = rebase_path(blink_core_output_dir, root_build_dir) rel_blink_core_gen_dir = rebase_path(blink_core_output_dir, root_build_dir)
...@@ -122,7 +122,8 @@ source_set("prerequisites") { ...@@ -122,7 +122,8 @@ source_set("prerequisites") {
# #
# GYP version: WebKit/Source/core/core.gyp:webcore # GYP version: WebKit/Source/core/core.gyp:webcore
source_set("core") { source_set("core") {
visibility = "//third_party/WebKit/*" visibility = [] # Allow re-assignment of list.
visibility = [ "//third_party/WebKit/*" ]
exported_deps = [ exported_deps = [
":core_generated", ":core_generated",
...@@ -930,7 +931,8 @@ make_token_matcher("make_core_generated_make_token_matcher_for_viewport") { ...@@ -930,7 +931,8 @@ make_token_matcher("make_core_generated_make_token_matcher_for_viewport") {
# You can use Blink-in-JS in your local experiment, but don't ship it. # You can use Blink-in-JS in your local experiment, but don't ship it.
# crbug.com/341031 # crbug.com/341031
action("make_core_generated_private_script") { action("make_core_generated_private_script") {
visibility = ":make_core_generated" visibility = [] # Allow re-assignment of list.
visibility = [ ":make_core_generated" ]
script = "../build/scripts/make_private_script_source.py" script = "../build/scripts/make_private_script_source.py"
inputs = [ inputs = [
...@@ -949,7 +951,8 @@ action("make_core_generated_private_script") { ...@@ -949,7 +951,8 @@ action("make_core_generated_private_script") {
} }
action("make_core_generated_private_script_for_testing") { action("make_core_generated_private_script_for_testing") {
visibility = ":make_core_generated" visibility = [] # Allow re-assignment of list.
visibility = [ ":make_core_generated" ]
script = "../build/scripts/make_private_script_source.py" script = "../build/scripts/make_private_script_source.py"
inputs = [ inputs = [
...@@ -968,7 +971,8 @@ action("make_core_generated_private_script_for_testing") { ...@@ -968,7 +971,8 @@ action("make_core_generated_private_script_for_testing") {
# "HTMLEntityTable" in make_core_generated from GYP. # "HTMLEntityTable" in make_core_generated from GYP.
action("make_core_generated_html_entity_table") { action("make_core_generated_html_entity_table") {
visibility = ":make_core_generated" visibility = [] # Allow re-assignment of list.
visibility = [ ":make_core_generated" ]
script = "html/parser/create-html-entity-table" script = "html/parser/create-html-entity-table"
inputs = [ inputs = [
...@@ -986,7 +990,8 @@ action("make_core_generated_html_entity_table") { ...@@ -986,7 +990,8 @@ action("make_core_generated_html_entity_table") {
# "MediaQueryTokenizerCodepoints" in make_core_generated from GYP. # "MediaQueryTokenizerCodepoints" in make_core_generated from GYP.
action("make_core_generated_media_query_tokenizer_codepoints") { action("make_core_generated_media_query_tokenizer_codepoints") {
visibility = ":make_core_generated" visibility = [] # Allow re-assignment of list.
visibility = [ ":make_core_generated" ]
script = "../build/scripts/make_mediaquery_tokenizer_codepoints.py" script = "../build/scripts/make_mediaquery_tokenizer_codepoints.py"
outputs = [ outputs = [
...@@ -1002,7 +1007,8 @@ action("make_core_generated_media_query_tokenizer_codepoints") { ...@@ -1002,7 +1007,8 @@ action("make_core_generated_media_query_tokenizer_codepoints") {
# "UserAgentStyleSheets" in make_core_generated from GYP. # "UserAgentStyleSheets" in make_core_generated from GYP.
action("make_core_generated_user_agent_style_sheets") { action("make_core_generated_user_agent_style_sheets") {
visibility = ":make_core_generated" visibility = [] # Allow re-assignment of list.
visibility = [ ":make_core_generated" ]
script = "../build/scripts/make-file-arrays.py" script = "../build/scripts/make-file-arrays.py"
inputs = [ inputs = [
...@@ -1043,7 +1049,8 @@ action("make_core_generated_user_agent_style_sheets") { ...@@ -1043,7 +1049,8 @@ action("make_core_generated_user_agent_style_sheets") {
# "HTMLElementLookupTrie" in make_core_generated from GYP. # "HTMLElementLookupTrie" in make_core_generated from GYP.
action("make_core_generated_html_element_lookup_trie") { action("make_core_generated_html_element_lookup_trie") {
visibility = ":make_core_generated" visibility = [] # Allow re-assignment of list.
visibility = [ ":make_core_generated" ]
script = "../build/scripts/make_element_lookup_trie.py" script = "../build/scripts/make_element_lookup_trie.py"
input_file = "html/HTMLTagNames.in" input_file = "html/HTMLTagNames.in"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
import("//third_party/WebKit/Source/bindings/bindings.gni") import("//third_party/WebKit/Source/bindings/bindings.gni")
import("//third_party/WebKit/Source/core/core.gni") import("//third_party/WebKit/Source/core/core.gni")
visibility = "//third_party/WebKit/Source/*" visibility = [ "//third_party/WebKit/Source/*" ]
protocol_file = "../../devtools/protocol.json" protocol_file = "../../devtools/protocol.json"
......
...@@ -33,7 +33,7 @@ devtools_extensions_js_files = gypi_values.devtools_extensions_js_files - ...@@ -33,7 +33,7 @@ devtools_extensions_js_files = gypi_values.devtools_extensions_js_files -
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
visibility = "//third_party/WebKit/*" visibility = [ "//third_party/WebKit/*" ]
# Probably need to parameterize this. If we set it to true, there will be some # Probably need to parameterize this. If we set it to true, there will be some
# further work in the scripts below. # further work in the scripts below.
......
...@@ -9,11 +9,12 @@ import("//third_party/WebKit/Source/build/make_file_arrays.gni") ...@@ -9,11 +9,12 @@ import("//third_party/WebKit/Source/build/make_file_arrays.gni")
import("//third_party/WebKit/Source/build/scripts/scripts.gni") import("//third_party/WebKit/Source/build/scripts/scripts.gni")
import("//third_party/WebKit/Source/modules/modules.gni") import("//third_party/WebKit/Source/modules/modules.gni")
visibility = "//third_party/WebKit/Source/*" visibility = [ "//third_party/WebKit/Source/*" ]
# GYP version: WebKit/Source/modules/modules.gyp:modules # GYP version: WebKit/Source/modules/modules.gyp:modules
source_set("modules") { source_set("modules") {
visibility = "//third_party/WebKit/*" visibility = [] # Allow re-assignment of list.
visibility = [ "//third_party/WebKit/*" ]
sources = rebase_path(modules_files, ".", "//") sources = rebase_path(modules_files, ".", "//")
sources += bindings_modules_v8_files sources += bindings_modules_v8_files
......
...@@ -9,7 +9,7 @@ import("//third_party/WebKit/Source/platform/platform.gni") ...@@ -9,7 +9,7 @@ import("//third_party/WebKit/Source/platform/platform.gni")
import("//third_party/WebKit/Source/platform/platform_generated.gni") import("//third_party/WebKit/Source/platform/platform_generated.gni")
# Most targets in this file are private actions so use that as the default. # Most targets in this file are private actions so use that as the default.
visibility = ":*" visibility = [ ":*" ]
heap_gypi = exec_script( heap_gypi = exec_script(
"//build/gypi_to_gn.py", "//build/gypi_to_gn.py",
...@@ -27,7 +27,8 @@ blink_platform_neon_files = [ ...@@ -27,7 +27,8 @@ blink_platform_neon_files = [
# blink_common in blink_platform.gyp # blink_common in blink_platform.gyp
component("blink_common") { component("blink_common") {
visibility = "//third_party/WebKit/*" visibility = [] # Allow re-assignment of list.
visibility = [ "//third_party/WebKit/*" ]
sources = [ sources = [
"exported/WebCString.cpp", "exported/WebCString.cpp",
"exported/WebString.cpp", "exported/WebString.cpp",
...@@ -149,7 +150,8 @@ action("color_data") { ...@@ -149,7 +150,8 @@ action("color_data") {
# This isn't strictly necessary since we can just add the deps to "platform", # This isn't strictly necessary since we can just add the deps to "platform",
# but it helps to have the targets match the GYP build. # but it helps to have the targets match the GYP build.
group("make_platform_generated") { group("make_platform_generated") {
visibility = "//third_party/WebKit/Source/*" visibility = [] # Allow re-assignment of list.
visibility = [ "//third_party/WebKit/Source/*" ]
deps = [ deps = [
":blink_common", ":blink_common",
":color_data", ":color_data",
...@@ -161,7 +163,8 @@ group("make_platform_generated") { ...@@ -161,7 +163,8 @@ group("make_platform_generated") {
# TODO(brettw) Objective C Renaming postbuild steps on Mac. # TODO(brettw) Objective C Renaming postbuild steps on Mac.
# blink_platform target in blink_platform.gyp # blink_platform target in blink_platform.gyp
component("platform") { component("platform") {
visibility = "//third_party/WebKit/*" visibility = [] # Allow re-assignment of list.
visibility = [ "//third_party/WebKit/*" ]
output_name = "blink_platform" output_name = "blink_platform"
sources = platform_files sources = platform_files
...@@ -333,7 +336,8 @@ component("platform") { ...@@ -333,7 +336,8 @@ component("platform") {
} }
test("heap_unittests") { test("heap_unittests") {
visibility = "//third_party/WebKit/*" visibility = [] # Allow re-assignment of list.
visibility = [ "//third_party/WebKit/*" ]
output_name = "blink_heap_unittests" output_name = "blink_heap_unittests"
sources = rebase_path(heap_gypi.platform_heap_test_files, ".", "heap") sources = rebase_path(heap_gypi.platform_heap_test_files, ".", "heap")
...@@ -357,7 +361,8 @@ test("heap_unittests") { ...@@ -357,7 +361,8 @@ test("heap_unittests") {
} }
test("platform_unittests") { test("platform_unittests") {
visibility = "//third_party/WebKit/*" visibility = [] # Allow re-assignment of list.
visibility = [ "//third_party/WebKit/*" ]
output_name = "blink_platform_unittests" output_name = "blink_platform_unittests"
sources = platform_test_files sources = platform_test_files
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
visibility = "//third_party/WebKit/Source/*" visibility = [ "//third_party/WebKit/Source/*" ]
source_set("heap") { source_set("heap") {
sources = [ sources = [
......
...@@ -9,7 +9,7 @@ import("//third_party/WebKit/Source/core/core.gni") ...@@ -9,7 +9,7 @@ import("//third_party/WebKit/Source/core/core.gni")
import("//third_party/WebKit/Source/modules/modules.gni") import("//third_party/WebKit/Source/modules/modules.gni")
import("//third_party/WebKit/Source/platform/platform.gni") import("//third_party/WebKit/Source/platform/platform.gni")
visibility = "//third_party/WebKit/*" visibility = [ "//third_party/WebKit/*" ]
web_gypi = exec_script( web_gypi = exec_script(
"//build/gypi_to_gn.py", "//build/gypi_to_gn.py",
[ rebase_path("web.gypi") ], [ rebase_path("web.gypi") ],
......
...@@ -8,7 +8,7 @@ gypi_values = exec_script("//build/gypi_to_gn.py", ...@@ -8,7 +8,7 @@ gypi_values = exec_script("//build/gypi_to_gn.py",
"scope", "scope",
[ "wtf.gypi" ]) [ "wtf.gypi" ])
visibility = "//third_party/WebKit/*" visibility = [ "//third_party/WebKit/*" ]
config("wtf_config") { config("wtf_config") {
if (is_win) { if (is_win) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment