gn/mac: Build GL code, and include CGL code.

BUG=chromium:431177

Change-Id: Id9c8ad68a9703591d6f576bfae3d7061526ed27f
Reviewed-on: https://chromium-review.googlesource.com/344740
Tryjob-Request: Nico Weber <thakis@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>

BUILD.gn

@@ -299,6 +299,15 @@ static_library("libANGLE") {
         "Xext",
       ]
     }
+    if (is_mac) {
+      sources += rebase_path(gles_gypi.libangle_gl_cgl_sources, ".", "src")
+      libs += [
+        "Cocoa.framework",
+        "IOSurface.framework",
+        "OpenGL.framework",
+        "QuartzCore.framework",
+      ]
+    }
   }
 
   if (is_debug) {

build/angle_common.gni

@@ -14,11 +14,13 @@ if (is_win) {
   angle_enable_gl = true
 
   import("//build/config/win/visual_studio_version.gni")
-} # is_win
-
-if (is_linux && use_x11 && !is_chromeos) {
+} else if (is_linux && use_x11 && !is_chromeos) {
+  angle_enable_gl = true
+} else if (is_mac) {
   angle_enable_gl = true
 }
+# TODO(gyp): Probably also want to angle_enable_gl = true if (use_ozone)
+# to match gyp.
 
 angle_enable_essl = true
 angle_enable_glsl = true

src/libGLESv2.gypi

@@ -834,9 +834,9 @@
                             {
                                 'libraries':
                                 [
-                                    '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
-                                    '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework',
                                     '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
+                                    '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework',
+                                    '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
                                     '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
                                 ],
                             },