Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / components.gyp

diff --git a/src/components/components.gyp b/src/components/components.gyp
index e696a24..f7c6638 100644 (file)
--- a/src/components/components.gyp
+++ b/src/components/components.gyp
@@ -24,6 +24,7 @@
     'dom_distiller.gypi',
     'domain_reliability.gypi',
     'enhanced_bookmarks.gypi',
+    'error_page.gypi',
     'favicon.gypi',
     'favicon_base.gypi',
     'google.gypi',
@@ -33,6 +34,7 @@
     'keyed_service.gypi',
     'language_usage_metrics.gypi',
     'leveldb_proto.gypi',
+    'login.gypi',
     'metrics.gypi',
     'navigation_metrics.gypi',
     'network_time.gypi',
@@ -48,6 +50,7 @@
     'rappor.gypi',
     'search.gypi',
     'search_provider_logos.gypi',
+    'sessions.gypi',
     'signin.gypi',
     'startup_metric_utils.gypi',
     'suggestions.gypi',
@@ -61,11 +64,12 @@
   'conditions': [
     ['OS != "ios"', {
       'includes': [
+        'app_modal_dialogs.gypi',
         'cdm.gypi',
+        'copresence_sockets.gypi',
         'navigation_interception.gypi',
         'plugins.gypi',
         'power.gypi',
-        'sessions.gypi',
         'visitedlink.gypi',
         'web_cache.gypi',
         'web_contents_delegate_android.gypi',
@@ -87,6 +91,7 @@
     ['chromeos == 1', {
       'includes': [
         'pairing.gypi',
+        'timers.gypi',
       ],
     }],
     ['OS == "win" or OS == "mac"', {
@@ -94,12 +99,17 @@
         'wifi.gypi',
       ],
     }],
-    ['use_ash==1', {
+    ['chromeos == 1 or use_ash == 1', {
       'includes': [
         'session_manager.gypi',
         'user_manager.gypi',
       ],
     }],
+    ['toolkit_views==1', {
+      'includes': [
+        'constrained_window.gypi',
+      ],
+    }],
     ['android_webview_build == 0', {
       # Android WebView fails to build if a dependency on these targets is
       # introduced.
@@ -112,11 +122,6 @@
         'invalidation.gypi',
       ],
     }],
-    ['toolkit_views==1', {
-      'includes': [
-        'native_app_window.gypi',
-      ],
-    }],
     ['enable_plugins==1', {
       'includes': [
         'pdf.gypi',