Update To 11.40.268.0

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

diff --git a/src/ui/aura/BUILD.gn b/src/ui/aura/BUILD.gn
index 7f4c9c4..2acd411 100644 (file)
--- a/src/ui/aura/BUILD.gn
+++ b/src/ui/aura/BUILD.gn
@@ -87,6 +87,7 @@ component("aura") {
     "../wm/public/transient_window_client.h",
     "../wm/public/window_move_client.cc",
     "../wm/public/window_move_client.h",
+    "../wm/public/window_types.h",
   ]
 
   defines = [
@@ -114,6 +115,11 @@ component("aura") {
     deps += [
       "//ui/events/platform/x11",
     ]
+  } else {
+    sources -= [
+      "window_tree_host_x11.cc",
+      "window_tree_host_x11.h",
+    ]
   }
 
   if (is_win) {
@@ -133,15 +139,15 @@ component("aura") {
       "window_tree_host_ozone.h",
     ]
 
-    # TODO(GYP) enable when these targets exist.
-    #deps += [
-    #  "//ui/events/ozone",
-    #  "//ui/ozone",
-    #]
+    deps += [
+      "//ui/events/ozone:events_ozone",
+      "//ui/ozone",
+    ]
   }
 }
 
 source_set("test_support") {
+  testonly = true
   sources = [
     "test/aura_test_base.cc",
     "test/aura_test_base.h",
@@ -169,13 +175,16 @@ source_set("test_support") {
     "test/window_event_dispatcher_test_api.h",
     "test/window_test_api.cc",
     "test/window_test_api.h",
+    "test/x11_event_sender.cc",
+    "test/x11_event_sender.h",
   ]
 
-  deps = [
+  public_deps = [
     ":aura",
+  ]
+  deps = [
     "//skia",
     "//testing/gtest",
-    "//ui/base",
     "//ui/base:test_support",
     "//ui/compositor:test_support",
     "//ui/events",
@@ -183,6 +192,7 @@ source_set("test_support") {
     "//ui/events:test_support",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/wm",
   ]
 
   if (is_win) {
@@ -208,6 +218,8 @@ source_set("test_support") {
 
 executable("demo") {
   output_name = "aura_demo"
+  testonly = true
+
   sources = [
     "demo/demo_main.cc",
   ]
@@ -225,6 +237,7 @@ executable("demo") {
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/gl",
   ]
 
   if (use_x11) {
@@ -236,16 +249,18 @@ executable("demo") {
 
 executable("bench") {
   output_name = "aura_bench"
+  testonly = true
+
   sources = [
     "bench/bench_main.cc",
   ]
 
   deps = [
-    ":aura",
     ":test_support",
     "//base",
     "//base:i18n",
     "//cc",
+    "//gpu/command_buffer/client:gles2_interface",
     "//skia",
     "//third_party/icu",
     "//ui/base",
@@ -254,6 +269,7 @@ executable("bench") {
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/gl",
   ]
 
   if (use_x11) {
@@ -263,8 +279,7 @@ executable("bench") {
   }
 }
 
-test("unittests") {
-  output_name = "aura_unittests"
+test("aura_unittests") {
   sources = [
     "gestures/gesture_recognizer_unittest.cc",
     "test/run_all_unittests.cc",
@@ -274,18 +289,14 @@ test("unittests") {
   ]
 
   deps = [
-    ":aura",
     ":test_support",
     "//base/allocator",
     "//base/test:test_support",
     "//skia",
     "//testing/gtest",
-    "//ui/base",
     "//ui/base:test_support",
-    "//ui/compositor",
     "//ui/compositor:test_support",
-    "//ui/events",
-    "//ui/events:events_base",
+    "//ui/events:test_support",
     "//ui/events:gesture_detection",
     "//ui/gfx",
     "//ui/gfx/geometry",