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

Unified Diff: mojo/services/native_viewport/BUILD.gn

Issue 584743003: 4th attempt to land change to remove NativeViewportService and (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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/html_viewer/html_viewer.cc ('k') | mojo/services/native_viewport/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/native_viewport/BUILD.gn
diff --git a/mojo/services/native_viewport/BUILD.gn b/mojo/services/native_viewport/BUILD.gn
index 704b9df9b75ab8d4818d67f85b392eaf33d696a7..3e47c248147af14ad77f6600e5d169c1c81492f9 100644
--- a/mojo/services/native_viewport/BUILD.gn
+++ b/mojo/services/native_viewport/BUILD.gn
@@ -4,10 +4,25 @@
import("//build/config/ui.gni")
-# GYP version: mojo/mojo_services.gypi:mojo_native_viewport_service_lib
-static_library("native_viewport") {
- output_name = "mojo_native_viewport"
+if (!is_android) {
+ shared_library("native_viewport") {
+ output_name = "mojo_native_viewport_service"
+ deps = [
+ ":lib",
+ "//base",
+ "//mojo/application",
+ "//mojo/public/c/system:for_shared_library",
+ "//mojo/public/cpp/bindings:bindings",
+ "//mojo/services/public/interfaces/native_viewport",
+ "//ui/gl",
+ ]
+
+ sources = [ "main.cc" ]
+ }
+}
+
+source_set("lib") {
deps = [
"//base",
"//cc/surfaces",
@@ -53,13 +68,6 @@ static_library("native_viewport") {
deps += [ "//mojo:jni_headers" ]
}
- if (is_win) {
- deps += [
- # TODO(GYP)
- # '../ui/platform_window/win/win_window.gyp:win_window',
- ]
- }
-
if (use_x11) {
sources += [ "platform_viewport_x11.cc" ]
deps += [
« no previous file with comments | « mojo/services/html_viewer/html_viewer.cc ('k') | mojo/services/native_viewport/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698