diff options
| author | jamesr <jamesr@chromium.org> | 2014-09-16 13:23:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-16 20:23:55 +0000 |
| commit | bef0b9045da427c4f2212a5aeb0a878eddee0edc (patch) | |
| tree | f8572af469188ab965fc0b2c076f7dc1f0a1e235 /mojo/gles2 | |
| parent | c8fad04c1e2119f9e8efc68f32d5268161d044d3 (diff) | |
| download | chromium_src-bef0b9045da427c4f2212a5aeb0a878eddee0edc.zip chromium_src-bef0b9045da427c4f2212a5aeb0a878eddee0edc.tar.gz chromium_src-bef0b9045da427c4f2212a5aeb0a878eddee0edc.tar.bz2 | |
GN: Replace mojo/system.gni with forwarding groups
Many targets in mojo need to depend on different targets depending on if
they are building in the static or component build. In gyp, this is done
with variables (since that's the only thing you have) and the GN build
initially copied these variables into //mojo/system.gni. This worked, but
is not very idomatic in GN. This replaces the variables with groups that
forward to the correct depenedency depending on the build type and
target type (encoded in the target name).
R=brettw@chromium.org, viettrungluu@chromium.org
Review URL: https://codereview.chromium.org/554363005
Cr-Commit-Position: refs/heads/master@{#295137}
Diffstat (limited to 'mojo/gles2')
| -rw-r--r-- | mojo/gles2/BUILD.gn | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mojo/gles2/BUILD.gn b/mojo/gles2/BUILD.gn index ef49b9e..2118604 100644 --- a/mojo/gles2/BUILD.gn +++ b/mojo/gles2/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. import("//mojo/public/tools/bindings/mojom.gni") -import("//mojo/system.gni") config("mojo_use_gles2") { defines = [ "MOJO_USE_GLES2_IMPL" ] @@ -24,11 +23,11 @@ component("gles2") { "//gpu/command_buffer/common", "//gpu/command_buffer/client:gles2_implementation", "//gpu/command_buffer/client:gles2_interface", + "//mojo/public/c/system:for_component", "//mojo/services/gles2:bindings", "//mojo/services/gles2:interfaces", "//mojo/environment:chromium", ] - deps += mojo_system_for_component defines = [ "GL_GLEXT_PROTOTYPES", |