diff options
author | ben <ben@chromium.org> | 2015-11-18 20:37:05 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-19 04:37:55 +0000 |
commit | 02a377770e28b7b6129435d2eb27d38ac53dd619 (patch) | |
tree | d4fc8cc33db0cc878318d36e782fc0cf4d8e1fdb | |
parent | 8ff3b8bfc9cf81ab0c76b392c82106807f639df5 (diff) | |
download | chromium_src-02a377770e28b7b6129435d2eb27d38ac53dd619.zip chromium_src-02a377770e28b7b6129435d2eb27d38ac53dd619.tar.gz chromium_src-02a377770e28b7b6129435d2eb27d38ac53dd619.tar.bz2 |
Revert of Define MOJO_SHELL_CLIENT uniformly across content (patchset #3 id:40001 of https://codereview.chromium.org/1462753002/ )
Reason for revert:
Not needed.
Original issue's description:
> Define MOJO_SHELL_CLIENT uniformly across content
>
> Separated out of https://codereview.chromium.org/1452823003/
>
> TBR=jam@chromium.org
> http://crbug.com/551253
>
> Committed: https://crrev.com/5e739169f376c3bf9c2c35a4efa0ebb6cbb3a9ee
> Cr-Commit-Position: refs/heads/master@{#360514}
TBR=jam@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1455423002
Cr-Commit-Position: refs/heads/master@{#360522}
-rw-r--r-- | content/app/BUILD.gn | 1 | ||||
-rw-r--r-- | content/browser/BUILD.gn | 7 | ||||
-rw-r--r-- | content/child/BUILD.gn | 5 | ||||
-rw-r--r-- | content/common/BUILD.gn | 2 | ||||
-rw-r--r-- | content/gpu/BUILD.gn | 5 | ||||
-rw-r--r-- | content/plugin/BUILD.gn | 5 | ||||
-rw-r--r-- | content/ppapi_plugin/BUILD.gn | 5 | ||||
-rw-r--r-- | content/public/browser/BUILD.gn | 1 | ||||
-rw-r--r-- | content/public/common/BUILD.gn | 9 | ||||
-rw-r--r-- | content/public/renderer/BUILD.gn | 5 | ||||
-rw-r--r-- | content/renderer/BUILD.gn | 1 | ||||
-rw-r--r-- | content/test/BUILD.gn | 6 | ||||
-rw-r--r-- | content/utility/BUILD.gn | 5 |
13 files changed, 11 insertions, 46 deletions
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn index 021c51f..b83b529 100644 --- a/content/app/BUILD.gn +++ b/content/app/BUILD.gn @@ -70,7 +70,6 @@ if (is_ios) { content_app_extra_configs = [ "//build/config/compiler:wexit_time_destructors", "//content:content_implementation", - "//content/public/common:mojo_shell_client", "//v8:external_startup_data", ] diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn index 98880f5..e98e681 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -12,10 +12,7 @@ source_set("browser") { # internal content ones) should depend on the public one. visibility = [ "//content/public/browser:browser_sources" ] - configs += [ - "//build/config:precompiled_headers", - "//content/public/common:mojo_shell_client", - ] + configs += [ "//build/config:precompiled_headers" ] defines = [] libs = [] ldflags = [] @@ -107,6 +104,8 @@ source_set("browser") { ], ".") + defines += [ "MOJO_SHELL_CLIENT" ] + # Non-iOS deps. deps += [ "//cc", diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn index 3ebac31..02dec55 100644 --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn @@ -15,10 +15,7 @@ source_set("child") { ".", "//content") - configs += [ - "//build/config:precompiled_headers", - "//content/public/common:mojo_shell_client", - ] + configs += [ "//build/config:precompiled_headers" ] public_deps = [ "//third_party/mojo/src/mojo/edk/system", diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn index fef64c5..be9766f 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -209,7 +209,7 @@ source_set("common") { ] } - defines = [] + defines = [ "MOJO_SHELL_CLIENT" ] include_dirs = [] libs = [] ldflags = [] diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn index ea70fe5..74c0142 100644 --- a/content/gpu/BUILD.gn +++ b/content/gpu/BUILD.gn @@ -38,10 +38,7 @@ source_set("gpu_sources") { "in_process_gpu_thread.h", ] - configs += [ - "//content:content_implementation", - "//content/public/common:mojo_shell_client", - ] + configs += [ "//content:content_implementation" ] deps = [ "//base", diff --git a/content/plugin/BUILD.gn b/content/plugin/BUILD.gn index 096b3ce..32b6e03 100644 --- a/content/plugin/BUILD.gn +++ b/content/plugin/BUILD.gn @@ -28,10 +28,7 @@ if (enable_plugins && !is_linux) { "webplugin_proxy.h", ] - configs += [ - "//content:content_implementation", - "//content/public/common:mojo_shell_client", - ] + configs += [ "//content:content_implementation" ] deps = [ "//content:export", diff --git a/content/ppapi_plugin/BUILD.gn b/content/ppapi_plugin/BUILD.gn index 6ce967d..ef4dcdf 100644 --- a/content/ppapi_plugin/BUILD.gn +++ b/content/ppapi_plugin/BUILD.gn @@ -32,10 +32,7 @@ source_set("ppapi_plugin_sources") { "ppapi_thread.h", ] - configs += [ - "//content:content_implementation", - "//content/public/common:mojo_shell_client", - ] + configs += [ "//content:content_implementation" ] deps = [ "//base", diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn index aaa0ae4..89fdec1 100644 --- a/content/public/browser/BUILD.gn +++ b/content/public/browser/BUILD.gn @@ -46,7 +46,6 @@ source_set("browser_sources") { configs += [ "//build/config:precompiled_headers", "//content:content_implementation", - "//content/public/common:mojo_shell_client", ] public_deps = [ diff --git a/content/public/common/BUILD.gn b/content/public/common/BUILD.gn index 9c1e0f7..63f5fa9 100644 --- a/content/public/common/BUILD.gn +++ b/content/public/common/BUILD.gn @@ -44,15 +44,6 @@ config("static_switches_defines") { defines = [ "COMPILE_CONTENT_STATICALLY" ] } -# Set in GN builds, triggering behavior in content when run from an external -# Mojo shell. -config("mojo_shell_client") { - # This configuration has only been tested on these platforms. - if (is_win || is_linux || is_chromeos) { - defines = [ "MOJO_SHELL_CLIENT" ] - } -} - # This target allows you to use the content_switches constants and statically # link to it, without depending on the rest of content. This is only for use # without content, or you will get multiply defined symbols. diff --git a/content/public/renderer/BUILD.gn b/content/public/renderer/BUILD.gn index 778d66f..0ab2d33 100644 --- a/content/public/renderer/BUILD.gn +++ b/content/public/renderer/BUILD.gn @@ -25,10 +25,7 @@ source_set("renderer_sources") { ".", "//content") - configs += [ - "//content:content_implementation", - "//content/public/common:mojo_shell_client", - ] + configs += [ "//content:content_implementation" ] deps = [ "//content/public/common:common_sources", diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn index 0f26c21..cf164b7 100644 --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn @@ -18,7 +18,6 @@ source_set("renderer") { configs += [ "//content:content_implementation", - "//content/public/common:mojo_shell_client", "//build/config/compiler:no_size_t_to_int_warning", ] diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index c6d764c..c9f5fa0 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -349,7 +349,6 @@ test("content_browsertests") { configs += [ "//build/config:precompiled_headers", "//build/config/compiler:no_size_t_to_int_warning", - "//content/public/common:mojo_shell_client", ] deps = [ @@ -550,10 +549,7 @@ test("content_unittests") { } } - configs += [ - "//build/config:precompiled_headers", - "//content/public/common:mojo_shell_client", - ] + configs += [ "//build/config:precompiled_headers" ] deps = [ ":test_support", diff --git a/content/utility/BUILD.gn b/content/utility/BUILD.gn index 9bfe941..65012ac 100644 --- a/content/utility/BUILD.gn +++ b/content/utility/BUILD.gn @@ -13,10 +13,7 @@ source_set("utility") { sources = rebase_path(content_utility_gypi_values.utility_sources, ".", "//content") - configs += [ - "//content:content_implementation", - "//content/public/common:mojo_shell_client", - ] + configs += [ "//content:content_implementation" ] deps = [ "//base", |