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

Unified Diff: cc/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 | « no previous file | content/shell/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/BUILD.gn
diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 78f7bc41655f5703bc019ad87e80f6ebec027040..211de0d8766f81b67b12afe5d7b300097f1bf0a0 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -602,7 +602,7 @@ source_set("test_support") {
deps = [
"//base",
"//base/third_party/dynamic_annotations",
- "//gpu:gpu_unittest_utils",
+ "//gpu:test_support",
"//gpu/command_buffer/client:gles2_c_lib",
"//gpu/command_buffer/client:gles2_implementation",
"//gpu/command_buffer/client:gl_in_process_context",
@@ -610,13 +610,15 @@ source_set("test_support") {
"//skia",
"//testing/gmock",
"//testing/gtest",
- # TODO(GYP)
- #"//third_party/mesa/mesa.gyp:osmesa",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/gfx:test_support",
"//ui/gl",
]
+
+ if (!is_android) { # TODO(GYP) Enable on Android when osmesa links.
+ deps += [ "//third_party/mesa:osmesa" ]
+ }
}
test("cc_unittests") {
@@ -747,7 +749,7 @@ test("cc_unittests") {
"//base/test:test_support",
"//cc/surfaces",
"//gpu",
- "//gpu:gpu_unittest_utils",
+ "//gpu:test_support",
"//media",
"//testing/gmock",
"//testing/gtest",
@@ -778,7 +780,7 @@ test("cc_perftests") {
":test_support",
"//base",
"//gpu",
- "//gpu:gpu_unittest_utils",
+ "//gpu:test_support",
"//media",
"//skia",
"//testing/gmock",
« no previous file with comments | « no previous file | content/shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698