commit fa91627a758f413e33f7b17056b68271e3c0a4f8
author Brian Osman <brianosman@google.com> Fri Dec 01 09:18:20 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 01 14:47:10 2017 +0000
tree 906a0ac3f084d6157e2b69a3d6a9afcdf56d9402
parent 120be30e4baaa17b1009368f6f2c588501355e52

Move some bits from views to sk_app

Most of these are required for sk_app, and have nothing to do with the
code that's left in views at this point. No presubmit due to missing
copyright in third-party public domain code.


No-Presubmit: true
Bug: skia:
Change-Id: If725f755f7f12f26b6bdc0cacfb136557b831bcf
Reviewed-on: https://skia-review.googlesource.com/78981
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 416a42d..a194ac8 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1322,25 +1322,6 @@
         "src/views/SkTouchGesture.cpp",
         "src/views/SkView.cpp",
       ]
-      libs = []
-      deps = []
-      if (is_linux) {
-        public_include_dirs += [ "src/views/unix" ]
-        sources += [ "src/views/unix/keysym2ucs.c" ]
-        libs += [
-          "GL",
-          "X11",
-        ]
-      } else if (is_mac) {
-        libs += [
-          "QuartzCore.framework",
-          "Cocoa.framework",
-          "Foundation.framework",
-        ]
-      }
-      if (skia_use_angle) {
-        deps += [ "//third_party/angle2" ]
-      }
     }
   }
 
@@ -1724,8 +1705,13 @@
           "tools/sk_app/unix/GLWindowContext_unix.cpp",
           "tools/sk_app/unix/RasterWindowContext_unix.cpp",
           "tools/sk_app/unix/Window_unix.cpp",
+          "tools/sk_app/unix/keysym2ucs.c",
           "tools/sk_app/unix/main_unix.cpp",
         ]
+        libs += [
+          "GL",
+          "X11",
+        ]
       } else if (is_win) {
         sources += [
           "tools/sk_app/win/GLWindowContext_win.cpp",
@@ -1743,6 +1729,11 @@
           "tools/sk_app/mac/Window_mac.cpp",
           "tools/sk_app/mac/main_mac.cpp",
         ]
+        libs += [
+          "QuartzCore.framework",
+          "Cocoa.framework",
+          "Foundation.framework",
+        ]
       } else if (is_ios) {
         sources += [
           "tools/sk_app/ios/GLWindowContext_ios.cpp",