Second attempt to land change to remove NativeViewportService and

mojo/services/native_viewport/BUILD.gn

Index: mojo/services/native_viewport/BUILD.gn
diff --git a/mojo/services/native_viewport/BUILD.gn b/mojo/services/native_viewport/BUILD.gn
index 966883cc9ccf441b1f571c65461fbdafaecb6b9e..75960189512ae11d01e5df019de1055ea0d11a7e 100644
--- a/mojo/services/native_viewport/BUILD.gn
+++ b/mojo/services/native_viewport/BUILD.gn
@@ -4,10 +4,22 @@
 
 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",
+      "//mojo/public/c/system:for_shared_library",
+      "//mojo/services/public/interfaces/native_viewport",
+      "//ui/gl",
+    ]
+
+    sources = [ "main.cc" ]
+  }
+}
+
+source_set("lib") {
   deps = [
     "//base",
     "//cc/surfaces",
@@ -25,6 +37,7 @@ static_library("native_viewport") {
     "//ui/events/platform",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/gl",
   ]
 
   sources = [
@@ -49,13 +62,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 += [