diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2015-04-06 13:36:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-06 20:36:50 +0000 |
| commit | 59639a8ae80d96e4083be7a19865de32bbf798bc (patch) | |
| tree | fcf69676d5bb26b25022a6ec397c94d44aaa6451 /ui/surface/BUILD.gn | |
| parent | 59d32f501694975c4011ea85a67060a41140d0f4 (diff) | |
| download | chromium_src-59639a8ae80d96e4083be7a19865de32bbf798bc.zip chromium_src-59639a8ae80d96e4083be7a19865de32bbf798bc.tar.gz chromium_src-59639a8ae80d96e4083be7a19865de32bbf798bc.tar.bz2 | |
Revert of Work on Windows GN component build. (patchset #8 id:140001 of https://codereview.chromium.org/1053203003/)
Reason for revert:
Reverting the CL because I think that it broke the GN compile on Linux - See http://build.chromium.org/p/chromium.linux/builders/Linux%20GN/builds/26255/steps/compile/logs/stdio
Original issue's description:
> Work on Windows GN component build.
>
> This makes ppapi_shared link. This required many changes to gpu to match the structure of GYP in both component and non-component modes.
>
> BUG=470212
> CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg
>
> Committed: https://crrev.com/b3c7880dc9e66ff449b23e2273b4f20abecba442
> Cr-Commit-Position: refs/heads/master@{#323937}
TBR=dpranke@chromium.org,brettw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=470212
Review URL: https://codereview.chromium.org/1057993004
Cr-Commit-Position: refs/heads/master@{#323942}
Diffstat (limited to 'ui/surface/BUILD.gn')
| -rw-r--r-- | ui/surface/BUILD.gn | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/surface/BUILD.gn b/ui/surface/BUILD.gn index 6e262a4..3b25e0e 100644 --- a/ui/surface/BUILD.gn +++ b/ui/surface/BUILD.gn @@ -15,8 +15,6 @@ component("surface") { "transport_dib_win.cc", ] - configs += [ "//third_party/khronos:khronos_headers" ] - defines = [ "SURFACE_IMPLEMENTATION" ] deps = [ @@ -27,4 +25,8 @@ component("surface") { "//ui/gfx/geometry", "//ui/gl", ] + + if (use_x11) { + include_dirs = [ "//third_party/khronos" ] + } } |