Upstream version 10.39.225.0

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

diff --git a/src/ash/BUILD.gn b/src/ash/BUILD.gn
index b49942e..12ffc9c 100644 (file)
--- a/src/ash/BUILD.gn
+++ b/src/ash/BUILD.gn
@@ -16,9 +16,11 @@ component("ash") {
 
   defines = [ "ASH_IMPLEMENTATION" ]
 
-  deps = [
+  public_deps = [
     "//ash/resources",
     "//ash/strings",
+  ]
+  deps = [
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
@@ -29,6 +31,7 @@ component("ash") {
     "//net",
     "//skia",
     "//third_party/icu",
+    "//ui/accelerometer",
     "//ui/accessibility",
     "//ui/app_list",
     "//ui/aura",
@@ -49,11 +52,6 @@ component("ash") {
     "//url",
   ]
 
-  forward_dependent_configs_from = [
-    "//ash/resources",
-    "//ash/strings",
-  ]
-
   if (is_win) {
     sources -= [
       "sticky_keys/sticky_keys_controller.cc",
@@ -106,12 +104,8 @@ component("ash") {
     sources -= [
       "touch/touch_transformer_controller.cc",
       "touch/touch_transformer_controller.h",
-    ]
-  }
-
-  if (!use_ozone) {
-    sources -= [
-      "display/mouse_cursor_event_filter_ozone.cc",
+      "touch/touchscreen_util.cc",
+      "touch/touchscreen_util.h",
     ]
   }
 
@@ -137,8 +131,10 @@ component("ash_with_content") {
 
   defines = [ "ASH_WITH_CONTENT_IMPLEMENTATION" ]
 
-  deps = [
+  public_deps = [
     ":ash",
+  ]
+  deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
     "//content/public/browser",
@@ -157,17 +153,16 @@ component("ash_with_content") {
     "//ui/web_dialogs",
     "//url",
   ]
-
-  forward_dependent_configs_from = [
-    ":ash",
-  ]
 }
 
 static_library("test_support") {
+  testonly = true
   sources = gypi_values.ash_test_support_sources
 
-  deps = [
+  public_deps = [
     ":ash",
+  ]
+  deps = [
     "//ash/resources",
     "//content/test:test_support",
     "//skia",
@@ -197,6 +192,7 @@ static_library("test_support") {
 }
 
 static_library("ash_shell_lib") {
+  testonly = true
   sources = gypi_values.ash_shell_lib_sources
 
   deps = [
@@ -226,13 +222,11 @@ static_library("ash_shell_lib") {
     "//ui/resources",
     "//ui/views",
     "//ui/views:test_support",
-    #'../ui/views/examples/examples.gyp:views_examples_lib',  TODO(GYP)
-    #'../ui/views/examples/examples.gyp:views_examples_with_content_lib',  TODO(GYP)
+    "//ui/views/examples:views_examples_lib",
+    "//ui/views/examples:views_examples_with_content_lib",
   ]
 }
 
-if (false) {  # TODO(GYP) enable ash shell and unit tests when they link.
-
 test("ash_unittests") {
   sources = gypi_values.ash_unittests_sources
 
@@ -251,6 +245,7 @@ test("ash_unittests") {
     "//skia",
     "//testing/gtest",
     "//third_party/icu",
+    "//ui/accelerometer",
     "//ui/accessibility",
     "//ui/aura",
     "//ui/aura:test_support",
@@ -270,7 +265,7 @@ test("ash_unittests") {
     "//ui/views",
     "//ui/views:test_support",
     "//ui/views/controls/webview:test_support",
-    "//ui/web_dialogs",
+    "//ui/web_dialogs:test_support",
     "//ui/wm",
     "//url",
   ]
@@ -280,14 +275,11 @@ test("ash_unittests") {
       # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906
       "focus_cycler_unittest.cc",
       # All tests for multiple displays: not supported on Windows Ash.
-      "accelerators/nested_dispatcher_controller_unittest.cc",
       "wm/drag_window_resizer_unittest.cc",
       # Can't resize on Windows Ash. http://crbug.com/165962
-      "ash_root_window_transformer_unittest.cc",
       "magnifier/magnification_controller_unittest.cc",
       "wm/workspace/workspace_window_resizer_unittest.cc",
       "sticky_keys/sticky_keys_overlay_unittest.cc",
-      "sticky_keys/sticky_keys_unittest.cc",
       "system/tray/media_security/multi_profile_media_tray_item_unittest.cc",
       "autoclick/autoclick_unittest.cc",
     ]
@@ -304,7 +296,6 @@ test("ash_unittests") {
     sources -= [
       "accelerators/magnifier_key_scroller_unittest.cc",
       "accelerators/spoken_feedback_toggler_unittest.cc",
-      "touch/touch_transformer_controller_unittest.cc",
     ]
   }
   if (is_chromeos) {
@@ -320,15 +311,19 @@ test("ash_unittests") {
   } else {
     sources -= [
       "display/resolution_notification_controller_unittest.cc",
-      "touch/touch_transformer_controller_unittest.cc",
+      "touch/touchscreen_util_unittest.cc",
     ]
   }
 
+  if (!use_x11 || !is_chromeos) {
+    sources -= [ "touch/touch_transformer_controller_unittest.cc", ]
+  }
+
   # TODO(GYP) is this necessary?
   #['OS=="linux" and component=="shared_library" and use_allocator!="none"', {
   # ldflags = "-rdynamic"
 
-  if (use_ozone) {
+  if (!is_chromeos || use_ozone) {
     sources -= [
       "sticky_keys/sticky_keys_unittest.cc",  # crbug.com/354035
     ]
@@ -336,6 +331,7 @@ test("ash_unittests") {
 }
 
 executable("ash_shell") {
+  testonly = true
   sources = [
     "shell/shell_main.cc",
   ]
@@ -355,7 +351,7 @@ executable("ash_shell") {
 
   if (is_chromeos) {
     deps += [
-      "../device/bluetooth/bluetooth.gyp:device_bluetooth",
+      "//device/bluetooth",
     ]
   }
 }
@@ -367,17 +363,17 @@ test("ash_shell_unittests") {
   ]
 
   deps = [
+    ":ash_shell_lib",
+    ":test_support",
     "//base/test:test_support",
     "//components/user_manager",
     "//content/test:test_support",
     "//skia",
     "//testing/gtest",
-    "//ui/aaccessibility",
+    "//ui/accessibility",
   ]
 
   if (is_chromeos) {
     deps += [ "//ui/display" ]
   }
 }
-
-}  # if false