diff options
| author | blundell <blundell@chromium.org> | 2015-01-29 23:01:43 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-30 07:02:54 +0000 |
| commit | 33cb04550654d68c74f84d445eed184663bb15ab (patch) | |
| tree | a1871d16d582556ad4be6b3e290a6ab661a31181 /mojo/cc | |
| parent | 673df3d93162edb9ad89544a1979d58a15b35cc5 (diff) | |
| download | chromium_src-33cb04550654d68c74f84d445eed184663bb15ab.zip chromium_src-33cb04550654d68c74f84d445eed184663bb15ab.tar.gz chromium_src-33cb04550654d68c74f84d445eed184663bb15ab.tar.bz2 | |
Move services code brought in from Mojo to live under //third_party.
This CL moves services code that is brought in from the Mojo repo and currently
living in //mojo/services to instead live in //third_party/mojo_services/src.
It fixes up include paths, buildfile references, and DEPS entries to account
for the new state of the world.
Review URL: https://codereview.chromium.org/861683003
Cr-Commit-Position: refs/heads/master@{#313876}
Diffstat (limited to 'mojo/cc')
| -rw-r--r-- | mojo/cc/BUILD.gn | 2 | ||||
| -rw-r--r-- | mojo/cc/DEPS | 1 | ||||
| -rw-r--r-- | mojo/cc/output_surface_mojo.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mojo/cc/BUILD.gn b/mojo/cc/BUILD.gn index 43b9041..3cb6ee4 100644 --- a/mojo/cc/BUILD.gn +++ b/mojo/cc/BUILD.gn @@ -12,11 +12,11 @@ source_set("cc") { "//gpu/command_buffer/client:gles2_implementation", "//gpu/command_buffer/client:gles2_interface", "//mojo/converters/surfaces", - "//mojo/services/surfaces/public/interfaces", "//skia", "//third_party/mojo/src/mojo/public/c/gles2", "//third_party/mojo/src/mojo/public/cpp/environment", "//third_party/mojo/src/mojo/public/cpp/system", + "//third_party/mojo_services/src/surfaces/public/interfaces", ] sources = [ diff --git a/mojo/cc/DEPS b/mojo/cc/DEPS index 9390f5e..0e75526 100644 --- a/mojo/cc/DEPS +++ b/mojo/cc/DEPS @@ -2,4 +2,5 @@ include_rules = [ "+cc", "-cc/blink", "+gpu/command_buffer/client", + "+third_party/mojo_services/src/surfaces", ] diff --git a/mojo/cc/output_surface_mojo.h b/mojo/cc/output_surface_mojo.h index 445d1ab..a34193e 100644 --- a/mojo/cc/output_surface_mojo.h +++ b/mojo/cc/output_surface_mojo.h @@ -8,7 +8,7 @@ #include "base/macros.h" #include "cc/output/output_surface.h" #include "cc/surfaces/surface_id.h" -#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h" +#include "third_party/mojo_services/src/surfaces/public/interfaces/surfaces.mojom.h" namespace mojo { |