diff options
author | hartmanng <hartmanng@chromium.org> | 2015-07-23 13:53:16 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-23 20:53:56 +0000 |
commit | e6df87ba8fa7bfe4d20f8fe4420f0d7051f75721 (patch) | |
tree | 1cc3f97b5fc528ab480e517ee49ad6f0d4a92e50 | |
parent | b4a07c2fb9ad84fb317287024df29cecf07f5390 (diff) | |
download | chromium_src-e6df87ba8fa7bfe4d20f8fe4420f0d7051f75721.zip chromium_src-e6df87ba8fa7bfe4d20f8fe4420f0d7051f75721.tar.gz chromium_src-e6df87ba8fa7bfe4d20f8fe4420f0d7051f75721.tar.bz2 |
Revert of Gets gn check to execute cleanly in most other mojo dirs (patchset #3 id:40001 of https://codereview.chromium.org/1255543002/)
Reason for revert:
Broke Android GN Build: https://code.google.com/p/chromium/issues/detail?id=513410
Original issue's description:
> Gets gn check to execute cleanly in most other mojo dirs
>
> platform_handle, gles2 and common are trickier, but I want to get the rest of the dirs checked until resolved.
>
> BUG=none
> TEST=none
> R=ben@chromium.org
>
> Committed: https://crrev.com/c43de408ec5e514060a295eb4f6663da397ec6a2
> Cr-Commit-Position: refs/heads/master@{#340111}
TBR=ben@chromium.org,sky@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none
Review URL: https://codereview.chromium.org/1240373005
Cr-Commit-Position: refs/heads/master@{#340160}
-rw-r--r-- | .gn | 25 | ||||
-rw-r--r-- | mojo/common/BUILD.gn | 2 | ||||
-rw-r--r-- | mojo/converters/surfaces/BUILD.gn | 1 | ||||
-rw-r--r-- | mojo/environment/BUILD.gn | 2 | ||||
-rw-r--r-- | mojo/gpu/BUILD.gn | 1 | ||||
-rw-r--r-- | mojo/services/network/BUILD.gn | 6 | ||||
-rw-r--r-- | mojo/services/tracing/BUILD.gn | 1 | ||||
-rw-r--r-- | mojo/shell/BUILD.gn | 1 |
8 files changed, 2 insertions, 37 deletions
@@ -71,30 +71,7 @@ check_targets = [ #"//jingle/*", #"//media/*", # Lots of errors. - "mojo/android/*", - "mojo/application/*", - "mojo/build/*", - "mojo/cc/*", - - # TODO(sky): resolve this. - # "mojo/common/*", - "mojo/converters/*", - "mojo/environment/*", - - # TODO(sky): resolve this. - # "mojo/gles2/*", - "mojo/gpu/*", - "mojo/nacl/*", - - # TODO(sky): resolve this. - # "mojo/platform_handle/*", - "mojo/public/*", - "mojo/runner/*", - "mojo/services/*", - "mojo/shell/*", - "mojo/test/*", - "mojo/tools/*", - "mojo/util/*", + "//mojo/application/*", #"//native_client/*", #"//net/*", # Needs GN binary changes to work on Android. diff --git a/mojo/common/BUILD.gn b/mojo/common/BUILD.gn index 1548798..e87167c 100644 --- a/mojo/common/BUILD.gn +++ b/mojo/common/BUILD.gn @@ -56,7 +56,6 @@ source_set("url_type_converters") { ":common_base", "//base", "//base/third_party/dynamic_annotations", - "//third_party/mojo/src/mojo/public/cpp/bindings", "//url", ] } @@ -67,7 +66,6 @@ test("mojo_common_unittests") { ":common", "//base", "//base:message_loop_tests", - "//base/test:test_support", "//mojo/environment:chromium", "//testing/gtest", "//third_party/mojo/src/mojo/edk/test:run_all_unittests", diff --git a/mojo/converters/surfaces/BUILD.gn b/mojo/converters/surfaces/BUILD.gn index 9bcc72f..d4fec16 100644 --- a/mojo/converters/surfaces/BUILD.gn +++ b/mojo/converters/surfaces/BUILD.gn @@ -26,7 +26,6 @@ component("surfaces") { "//base", "//cc", "//cc/surfaces", - "//cc/surfaces:surface_id", "//components/view_manager/public/interfaces", "//gpu", "//ui/gfx/geometry", diff --git a/mojo/environment/BUILD.gn b/mojo/environment/BUILD.gn index 9621dfb..4dbe7c4 100644 --- a/mojo/environment/BUILD.gn +++ b/mojo/environment/BUILD.gn @@ -56,6 +56,6 @@ component("chromium_impl") { "//base", "//base/third_party/dynamic_annotations", "//mojo/common:common_base", - "//third_party/mojo/src/mojo/public/cpp/environment:environment", + "//third_party/mojo/src/mojo/public/c/environment", ] } diff --git a/mojo/gpu/BUILD.gn b/mojo/gpu/BUILD.gn index 4c5e350..41f0413 100644 --- a/mojo/gpu/BUILD.gn +++ b/mojo/gpu/BUILD.gn @@ -11,7 +11,6 @@ source_set("mojo_gles2_implementation") { configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] deps = [ - "//base", "//gpu/command_buffer/client:gles2_interface", "//third_party/mojo/src/mojo/public/c/gles2", ] diff --git a/mojo/services/network/BUILD.gn b/mojo/services/network/BUILD.gn index 0b9e804..ceb4519 100644 --- a/mojo/services/network/BUILD.gn +++ b/mojo/services/network/BUILD.gn @@ -89,10 +89,7 @@ source_set("lib") { deps = [ "//base", - "//components/filesystem/public/interfaces", "//mojo/application/public/cpp", - "//mojo/common:common_base", - "//mojo/common:url_type_converters", "//mojo/services/network/public/cpp", "//mojo/services/network/public/interfaces", "//net", @@ -100,7 +97,6 @@ source_set("lib") { "//net:http_server", "//url", "//sql/mojo", - "//third_party/mojo/src/mojo/public/cpp/system:system", ] } @@ -136,9 +132,7 @@ mojo_native_application("apptests") { ":lib", ":network", "//base", - "//mojo/application/public/cpp:sources", "//mojo/application/public/cpp:test_support", - "//mojo/common:common_base", "//mojo/services/network/public/cpp", "//mojo/services/network/public/interfaces", "//net", diff --git a/mojo/services/tracing/BUILD.gn b/mojo/services/tracing/BUILD.gn index 235374f..c618f37 100644 --- a/mojo/services/tracing/BUILD.gn +++ b/mojo/services/tracing/BUILD.gn @@ -35,6 +35,5 @@ source_set("lib") { ":bindings", "//base", "//mojo/application/public/cpp", - "//mojo/common:common_base", ] } diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn index 15d9d9d..5714d3b 100644 --- a/mojo/shell/BUILD.gn +++ b/mojo/shell/BUILD.gn @@ -48,7 +48,6 @@ source_set("shell") { deps = [ "//base/third_party/dynamic_annotations", "//crypto:crypto", - "//mojo/application/public/cpp:sources", "//url", "//third_party/mojo/src/mojo/edk/system", "//mojo/environment:chromium", |