Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2197)

Unified Diff: content/shell/BUILD.gn

Issue 409423002: Add osmesa to GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/BUILD.gn ('k') | gpu/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/BUILD.gn
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index f6e7f4f3f16dc169f84ebdbc2e0d17a148a480d2..16d2c859b38682e67b6bd56254f402a2679d9e81 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) {
@@ -453,7 +453,7 @@ executable("content_shell") {
}
if (!is_android || !is_android_webview_build) {
- deps += [
+ datadeps += [
# NOTE: rely on host build of this target.
#'../tools/imagediff/image_diff.gyp:image_diff', TODO(GYP)
]
« no previous file with comments | « cc/BUILD.gn ('k') | gpu/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698