Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ui / gl / BUILD.gn

diff --git a/src/ui/gl/BUILD.gn b/src/ui/gl/BUILD.gn
index 1820ca9..0cc2fe4 100644 (file)
--- a/src/ui/gl/BUILD.gn
+++ b/src/ui/gl/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//build/config/ui.gni")
 if (is_android) {
+  import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
@@ -117,19 +118,18 @@ component("gl") {
 
   deps = [
     ":generate_gl_bindings",
-    "//base",
     "//base/third_party/dynamic_annotations",
     "//gpu/command_buffer/common",
-    "//third_party/mesa:mesa_headers",
     "//skia",
+  ]
+  public_deps = [
+    "//base",
+    "//third_party/mesa:mesa_headers",
     "//ui/events/platform",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 
-  # TODO(GYP) hook up once this is converted.
-  forward_dependent_configs_from = [ "//third_party/mesa:mesa_headers" ]
-
   if (is_win || is_android || is_linux) {
     sources += [
       "egl_util.cc",
@@ -152,6 +152,9 @@ component("gl") {
       "gl_implementation_osmesa.h",
     ]
   }
+  if (is_linux) {
+    deps += [ "//third_party/libevent" ]
+  }
   if (use_x11) {
     sources += [
       "gl_context_glx.cc",
@@ -243,19 +246,18 @@ component("gl") {
       "gl_surface_ozone.cc",
     ]
     deps += [
-      #"//ui/gfx/ozone",
       "//ui/ozone",
+      "//ui/ozone:ozone_base",
     ]
   }
 
-  # TODO(GYP) enable this dependency once its written.
-  #if (is_android && !android_webview_build) {
-  #  deps += [ "//ui/android:ui_java" ]
-  #}
+  if (is_android && !is_android_webview_build) {
+    deps += [ "//ui/android:ui_java" ]
+  }
 }
 
 action("generate_gl_bindings") {
-  visibility = ":*"  # Only targets in this file can see this.
+  visibility = [ ":*" ]  # Only targets in this file can see this.
 
   script = "generate_bindings.py"
 
@@ -313,6 +315,7 @@ config("gl_unittest_utils_config") {
 }
 
 source_set("gl_unittest_utils") {
+  testonly = true
   sources = [
     "gl_mock.h",
     "gl_mock.cc",
@@ -322,7 +325,7 @@ source_set("gl_unittest_utils") {
   ]
 
   configs += [ "//third_party/khronos:khronos_headers" ]
-  direct_dependent_configs = [ ":gl_unittest_utils_config" ]
+  public_configs = [ ":gl_unittest_utils_config" ]
 
   deps = [
     ":gl",
@@ -338,7 +341,6 @@ if (is_android) {
 
   generate_jni("gl_jni_headers") {
     deps = [ ":surface_jni_headers" ]
-    forward_dependent_configs_from = [ ":surface_jni_headers" ]
     sources = [
       "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
       "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java",