Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
| 6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
| 7 import("//content/common/common.gni") | 7 import("//content/common/common.gni") |
| 8 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") | 8 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") |
| 9 | 9 |
| 10 if (is_chromeos && cpu_arch != "arm") { | 10 if (is_chromeos && cpu_arch != "arm") { |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 123 | 123 |
| 124 source_set("common") { | 124 source_set("common") { |
| 125 # Only the public target should depend on this. All other targets (even | 125 # Only the public target should depend on this. All other targets (even |
| 126 # internal content ones) should depend on the public one. | 126 # internal content ones) should depend on the public one. |
| 127 visibility = [ "//content/public/common:common_sources" ] | 127 visibility = [ "//content/public/common:common_sources" ] |
| 128 | 128 |
| 129 sources = rebase_path(content_common_gypi_values.private_common_sources, | 129 sources = rebase_path(content_common_gypi_values.private_common_sources, |
| 130 ".", | 130 ".", |
| 131 "//content") | 131 "//content") |
| 132 | 132 |
| 133 configs += [ "//content:content_implementation" ] | 133 configs += [ |
| 134 "//content:content_implementation", | |
| 135 "//build/config/compiler:no_size_t_to_int_warning", | |
| 136 ] | |
| 134 | 137 |
| 135 public_deps = [ | 138 public_deps = [ |
| 136 "//gpu/command_buffer/common", | 139 "//gpu/command_buffer/common", |
| 137 "//third_party/WebKit/public:blink_headers", | 140 "//third_party/WebKit/public:blink_headers", |
| 138 ] | 141 ] |
| 139 deps = [ | 142 deps = [ |
| 140 "//base", | 143 "//base", |
| 141 "//build/util:webkit_version", | 144 "//build/util:webkit_version", |
| 142 "//components/tracing", | 145 "//components/tracing", |
| 143 "//gpu/command_buffer/client:gles2_interface", | 146 "//gpu/command_buffer/client:gles2_interface", |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 446 "sandbox_linux/sandbox_bpf_base_policy_linux.h", | 449 "sandbox_linux/sandbox_bpf_base_policy_linux.h", |
| 447 ] | 450 ] |
| 448 } | 451 } |
| 449 if (is_android) { | 452 if (is_android) { |
| 450 sources -= [ | 453 sources -= [ |
| 451 "sandbox_linux/android/sandbox_bpf_base_policy_android.cc", | 454 "sandbox_linux/android/sandbox_bpf_base_policy_android.cc", |
| 452 "sandbox_linux/android/sandbox_bpf_base_policy_android.h", | 455 "sandbox_linux/android/sandbox_bpf_base_policy_android.h", |
| 453 ] | 456 ] |
| 454 } | 457 } |
| 455 } | 458 } |
| 459 | |
| 460 if (is_win && cpu_arch == "x64") { | |
| 461 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed. | |
| 462 cflags = [ "/bigobj" ] | |
| 463 } | |
|
Dirk Pranke
2015/02/18 21:29:29
Is this change intentional? It seems unrelated ...
| |
| 456 } | 464 } |
| 457 | 465 |
| 458 mojom("mojo_bindings") { | 466 mojom("mojo_bindings") { |
| 459 sources = [ | 467 sources = [ |
| 460 "application_setup.mojom", | 468 "application_setup.mojom", |
| 461 "geolocation_service.mojom", | 469 "geolocation_service.mojom", |
| 462 "permission_service.mojom", | 470 "permission_service.mojom", |
| 463 "presentation/presentation_service.mojom", | 471 "presentation/presentation_service.mojom", |
| 464 "render_frame_setup.mojom", | 472 "render_frame_setup.mojom", |
| 465 ] | 473 ] |
| 466 | 474 |
| 467 deps = [ | 475 deps = [ |
| 468 "//content/public/common:mojo_bindings", | 476 "//content/public/common:mojo_bindings", |
| 469 "//third_party/mojo/src/mojo/public/interfaces/application:application", | 477 "//third_party/mojo/src/mojo/public/interfaces/application:application", |
| 470 ] | 478 ] |
| 471 } | 479 } |
| OLD | NEW |