diff options
author | pkotwicz <pkotwicz@chromium.org> | 2015-04-06 13:36:06 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-06 20:36:50 +0000 |
commit | 59639a8ae80d96e4083be7a19865de32bbf798bc (patch) | |
tree | fcf69676d5bb26b25022a6ec397c94d44aaa6451 /gpu | |
parent | 59d32f501694975c4011ea85a67060a41140d0f4 (diff) | |
download | chromium_src-59639a8ae80d96e4083be7a19865de32bbf798bc.zip chromium_src-59639a8ae80d96e4083be7a19865de32bbf798bc.tar.gz chromium_src-59639a8ae80d96e4083be7a19865de32bbf798bc.tar.bz2 |
Revert of Work on Windows GN component build. (patchset #8 id:140001 of https://codereview.chromium.org/1053203003/)
Reason for revert:
Reverting the CL because I think that it broke the GN compile on Linux - See http://build.chromium.org/p/chromium.linux/builders/Linux%20GN/builds/26255/steps/compile/logs/stdio
Original issue's description:
> Work on Windows GN component build.
>
> This makes ppapi_shared link. This required many changes to gpu to match the structure of GYP in both component and non-component modes.
>
> BUG=470212
> CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg
>
> Committed: https://crrev.com/b3c7880dc9e66ff449b23e2273b4f20abecba442
> Cr-Commit-Position: refs/heads/master@{#323937}
TBR=dpranke@chromium.org,brettw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=470212
Review URL: https://codereview.chromium.org/1057993004
Cr-Commit-Position: refs/heads/master@{#323942}
Diffstat (limited to 'gpu')
-rw-r--r-- | gpu/BUILD.gn | 10 | ||||
-rw-r--r-- | gpu/blink/BUILD.gn | 1 | ||||
-rw-r--r-- | gpu/command_buffer/client/BUILD.gn | 54 | ||||
-rw-r--r-- | gpu/command_buffer/common/BUILD.gn | 20 | ||||
-rw-r--r-- | gpu/command_buffer/service/BUILD.gn | 22 | ||||
-rw-r--r-- | gpu/config/BUILD.gn | 18 | ||||
-rw-r--r-- | gpu/ipc/BUILD.gn | 18 |
7 files changed, 35 insertions, 108 deletions
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn index eba5e7a..d8ac30f 100644 --- a/gpu/BUILD.gn +++ b/gpu/BUILD.gn @@ -40,12 +40,12 @@ config("gpu_implementation") { component("gpu") { public_deps = [ - "//gpu/command_buffer/client:client_sources", + "//gpu/command_buffer/client", "//gpu/command_buffer/client:gles2_cmd_helper_sources", - "//gpu/command_buffer/common:common_sources", - "//gpu/command_buffer/service:service_sources", - "//gpu/config:config_sources", - "//gpu/ipc:ipc_sources", + "//gpu/command_buffer/common", + "//gpu/command_buffer/service", + "//gpu/config", + "//gpu/ipc", ] } diff --git a/gpu/blink/BUILD.gn b/gpu/blink/BUILD.gn index d034c47..7d08ba11 100644 --- a/gpu/blink/BUILD.gn +++ b/gpu/blink/BUILD.gn @@ -24,7 +24,6 @@ component("blink") { "//base/third_party/dynamic_annotations", "//cc", "//gpu/command_buffer/common", - "//gpu/command_buffer/common:gles2_utils", "//gpu/command_buffer/service", "//gpu/command_buffer/client:gles2_c_lib", "//gpu/command_buffer/client:gles2_implementation", diff --git a/gpu/command_buffer/client/BUILD.gn b/gpu/command_buffer/client/BUILD.gn index bbb7c0b..fabc82a 100644 --- a/gpu/command_buffer/client/BUILD.gn +++ b/gpu/command_buffer/client/BUILD.gn @@ -2,38 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# The files here go into the "gpu" component in a component build (with -# "command_buffer_client" and "gles2_cmd_helper" just forwarding) and goes into -# separate static libraries in non-component build. This needs to match the -# GYP build which was likely an attempt to make larger components to help with -# loading. -group("client") { - if (is_component_build) { - public_deps = [ - "//gpu", - ] - } else { - public_deps = [ - ":client_sources", - ] - } -} - -group("gles2_cmd_helper") { - if (is_component_build) { - public_deps = [ - "//gpu", - ] - } else { - public_deps = [ - ":gles2_cmd_helper_sources", - ] - } -} - -source_set("client_sources") { - visibility = [ "//gpu/*" ] - +source_set("client") { sources = [ "cmd_buffer_helper.cc", "cmd_buffer_helper.h", @@ -59,12 +28,27 @@ source_set("client_sources") { all_dependent_configs = [ "//third_party/khronos:khronos_headers" ] deps = [ - "//gpu/command_buffer/common:common_sources", + "//gpu/command_buffer/common", ] } +group("gles2_cmd_helper") { + if (is_component_build) { + deps = [ + "//gpu", + ] + } else { + deps = [ + ":gles2_cmd_helper_sources", + ] + } +} + source_set("gles2_cmd_helper_sources") { - visibility = [ "//gpu/*" ] + visibility = [ + ":gles2_cmd_helper", + "//gpu", + ] sources = [ "gles2_cmd_helper.cc", "gles2_cmd_helper.h", @@ -78,7 +62,7 @@ source_set("gles2_cmd_helper_sources") { ] deps = [ - ":client_sources", + ":client", ] } diff --git a/gpu/command_buffer/common/BUILD.gn b/gpu/command_buffer/common/BUILD.gn index 6f3ec0c..57935ac 100644 --- a/gpu/command_buffer/common/BUILD.gn +++ b/gpu/command_buffer/common/BUILD.gn @@ -2,25 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# The files here go into the "gpu" component in a component build (with -# "command_buffer_common" just forwarding) and goes into a static library in -# non-component build. This needs to match the GYP build which was likely an -# attempt to make larger components to help with loading. -group("common") { - if (is_component_build) { - public_deps = [ - "//gpu", - ] - } else { - public_deps = [ - ":common_sources", - ] - } -} - -source_set("common_sources") { - visibility = [ "//gpu/*" ] - +source_set("common") { sources = [ "bitfield_helpers.h", "buffer.cc", diff --git a/gpu/command_buffer/service/BUILD.gn b/gpu/command_buffer/service/BUILD.gn index 8045a03..44b0909 100644 --- a/gpu/command_buffer/service/BUILD.gn +++ b/gpu/command_buffer/service/BUILD.gn @@ -5,21 +5,7 @@ import("//build/config/ui.gni") import("//third_party/protobuf/proto_library.gni") -group("service") { - if (is_component_build) { - public_deps = [ - "//gpu", - ] - } else { - public_deps = [ - ":service_sources", - ] - } -} - -source_set("service_sources") { - visibility = [ "//gpu/*" ] - +source_set("service") { sources = [ "async_pixel_transfer_delegate.cc", "async_pixel_transfer_delegate.h", @@ -142,7 +128,7 @@ source_set("service_sources") { include_dirs = [ "//third_party/mesa/src/include" ] public_deps = [ - "//gpu/command_buffer/common:common_sources", + "//gpu/command_buffer/common", ] deps = [ ":disk_cache_proto", @@ -158,6 +144,10 @@ source_set("service_sources") { "//ui/gl", ] + if (ui_compositor_image_transport) { + include_dirs += [ "//third_party/khronos" ] + } + if (is_win || is_android || (is_linux && use_x11)) { sources += [ "async_pixel_transfer_manager_egl.cc", diff --git a/gpu/config/BUILD.gn b/gpu/config/BUILD.gn index add90ec..f949358 100644 --- a/gpu/config/BUILD.gn +++ b/gpu/config/BUILD.gn @@ -9,21 +9,7 @@ declare_args() { use_libpci = true } -group("config") { - if (is_component_build) { - public_deps = [ - "//gpu", - ] - } else { - public_deps = [ - ":config_sources", - ] - } -} - -source_set("config_sources") { - visibility = [ "//gpu/*" ] - +source_set("config") { sources = [ "dx_diag_node.cc", "dx_diag_node.h", @@ -66,7 +52,7 @@ source_set("config_sources") { deps = [ "//base", - "//gpu/command_buffer/service:service_sources", + "//gpu/command_buffer/service", "//third_party/re2", "//ui/gl", ] diff --git a/gpu/ipc/BUILD.gn b/gpu/ipc/BUILD.gn index c78dea7..d11d685 100644 --- a/gpu/ipc/BUILD.gn +++ b/gpu/ipc/BUILD.gn @@ -2,21 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -group("ipc") { - if (is_component_build) { - public_deps = [ - "//gpu", - ] - } else { - public_deps = [ - ":ipc_sources", - ] - } -} - -source_set("ipc_sources") { - visibility = [ "//gpu/*" ] - +source_set("ipc") { sources = [ "gpu_command_buffer_traits.cc", "gpu_command_buffer_traits.h", @@ -28,7 +14,7 @@ source_set("ipc_sources") { ] deps = [ - "//gpu/command_buffer/common:common_sources", + "//gpu/command_buffer/common", "//ipc", ] } |