mojo/services/public/cpp/view_manager/lib/BUILD.gn - Issue 574993002: Revert of Second attempt to land change to remove NativeViewportService and

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/services/public/cpp/view_manager/lib/BUILD.gn

Issue 574993002: Revert of Second attempt to land change to remove NativeViewportService and (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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 | « mojo/services/public/cpp/view_manager/BUILD.gn ('k') | mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/public/cpp/view_manager/lib/BUILD.gn

diff --git a/mojo/services/public/cpp/view_manager/lib/BUILD.gn b/mojo/services/public/cpp/view_manager/lib/BUILD.gn

index df44a34d4345458ba4d1e22ae579bb6c9223d0ac..32f4f3d416dcdae488ff0b85614c32156c4b9c89 100644

--- a/mojo/services/public/cpp/view_manager/lib/BUILD.gn

+++ b/mojo/services/public/cpp/view_manager/lib/BUILD.gn

@@ -16,14 +16,15 @@

deps = [

"//base",

"//base/test:test_support",

+ "//ui/gl",

]

+ if (is_linux || is_win) {

+ deps += [

+ "//third_party/mesa:osmesa",

+ "//mojo/services/native_viewport",

+ ]

+ }

if (use_x11) {

- deps += ["//ui/gfx/x"]

+ deps += [ "//ui/gfx/x" ]

}

- if (is_component_build) {

- deps += ["//ui/gl"]

- }

}