diff options
author | brettw <brettw@chromium.org> | 2016-03-17 20:22:46 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-18 03:24:04 +0000 |
commit | 09039c14ad6710587d13e64e3ddf8cad1d292347 (patch) | |
tree | f6d918fbc2fb89d1746908f005ada58f1fda7587 /skia | |
parent | ff43dcf4c622fb46b062abca1024a89fb01b54c7 (diff) | |
download | chromium_src-09039c14ad6710587d13e64e3ddf8cad1d292347.zip chromium_src-09039c14ad6710587d13e64e3ddf8cad1d292347.tar.gz chromium_src-09039c14ad6710587d13e64e3ddf8cad1d292347.tar.bz2 |
Enable GN check for gpu and rlz
Rlz already passed on Windows.
GPU had a bunch of errors which are fixed here by adding the necessary dependencies and in a few cases removing unnecessary headers.
gpu_memory_buffer_manager.h included stuff from ui/gfx but adding a dependency on //ui/gfx pulls Skia into the NaCl IRT (and mesa into Android) and everything goes badly. The GPU memory buffer stuff turns out to be separable from gfx so I created a new target for this.
The same is true for ui/gfx/native_widget_types.h (this is just some enums in a .h file) so I made a separate target for this as well.
In support of the Skia-in-NaCl problem, I added an assert_no_deps annotation on the NaCl IRT so people will get an error if they accidentally add this Skia dependency (this has come up before, it's easy to add a //ui/gfx dependency in the wrong place). It also fixes the Skia build in NaCl by updating the condition for extra warning to match build config. Without this update, the assert_no_deps won't be reached before an error running the skia build file, which won't make any sense in the context of addnig a random dependency.
Minor cleanup of the use_libpci conditionals that was exposed by this (the define that controlled the header didn't exactly match the corresponding dependencies).
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel
TBR=jschuh (gpu/ipc build changes)
Review URL: https://codereview.chromium.org/1800343002
Cr-Commit-Position: refs/heads/master@{#381881}
Diffstat (limited to 'skia')
-rw-r--r-- | skia/BUILD.gn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 1949ddb..5b825d0 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -444,7 +444,7 @@ component("skia") { sources += [ "ext/bitmap_platform_device_skia.cc" ] } - if (is_clang) { + if (is_clang && !is_nacl) { # Skia won't compile with some of the more strict clang warnings. # e.g. it does: # SkASSERT(!"sk_out_of_memory"); |