diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-23 22:35:10 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-23 22:35:10 +0000 |
| commit | c7990dbf8e71703b4d11a6ada1e6f609a876c9ee (patch) | |
| tree | 642d4a8fae1839f32b30ebb5a40dcc8201a9a290 /content | |
| parent | 20824b198d3f508ef3228e6d9ccc260f754235b9 (diff) | |
| download | chromium_src-c7990dbf8e71703b4d11a6ada1e6f609a876c9ee.zip chromium_src-c7990dbf8e71703b4d11a6ada1e6f609a876c9ee.tar.gz chromium_src-c7990dbf8e71703b4d11a6ada1e6f609a876c9ee.tar.bz2 | |
Add osmesa to GN build.
Rename gpu_unittest_utils test_utils for project consistency.
Add angle unit tests.
Update comments in GPU GYP file referencing GN targets.
Review URL: https://codereview.chromium.org/409423002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/shell/BUILD.gn | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn index e0ac164..674be31 100644 --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn @@ -249,9 +249,9 @@ static_library("content_shell_lib") { } if (use_x11) { - # TODO(GYP) The GYP build includes a dep on the xdisplaycheck executable. - # Track down who added this and ask them if it's necessary, since this - # seems suspicious. + # Some tests rely on this tool at runtime. Note: it might be better if + # the tests that needed it had this as a dep instead of adding it here. + datadeps = [ "//tools/xdisplaycheck" ] } if (is_android) { @@ -437,7 +437,7 @@ executable("content_shell") { ":content_shell_lib", ":pak", "//base/allocator", - #'../third_party/mesa/mesa.gyp:osmesa', TODO(GYP) + "//third_party/mesa:osmesa", ] if (is_win) { |