gn fixes for ui/gl and mac

ui/gl/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
 gl_binding_output_dir = target_gen_dir
@@ skipping 99 matching lines @@
     gl_binding_output_dir,
   ]
 
   all_dependent_configs = [ ":gl_config" ]
 
   deps = [
     ":generate_gl_bindings",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//gpu/command_buffer/common",
+    "//third_party/mesa:mesa_headers",
     "//skia",
-    # TODO(GYP) hook up once this is converted.
-    # Also uncomment forward statement below.
-    #"//third_party/mesa:mesa_headers",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 
   # TODO(GYP) hook up once this is converted.
-  #forward_dependent_configs_from = [ "//third_party/mesa:mesa_headers" ]
+  forward_dependent_configs_from = [ "//third_party/mesa:mesa_headers" ]
 
   if (is_win || is_android || is_linux) {
     sources += [
       "egl_util.cc",
       "egl_util.h",
       "gl_context_egl.cc",
       "gl_context_egl.h",
       "gl_image_egl.cc",
       "gl_image_egl.h",
       "gl_surface_egl.cc",
@@ skipping 185 matching lines @@
 
 if (is_android) {
   generate_jni("gl_jni_headers") {
     sources = [
       "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
       "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java",
     ]
     jni_package = "ui/gl"
   }
 }