Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / content_app.gypi

diff --git a/src/content/content_app.gypi b/src/content/content_app.gypi
index 6a419e4..12c2177 100644 (file)
--- a/src/content/content_app.gypi
+++ b/src/content/content_app.gypi
@@ -10,9 +10,9 @@
     '../base/base.gyp:base',
     '../base/base.gyp:base_i18n',
     '../crypto/crypto.gyp:crypto',
-    '../ui/events/events.gyp:events',
+    '../ui/base/ui_base.gyp:ui_base',
     '../ui/gfx/gfx.gyp:gfx',
-    '../ui/ui.gyp:ui',
+    '../ui/gfx/gfx.gyp:gfx_geometry',
   ],
   'sources': [
     'app/android/app_jni_registrar.cc',
@@ -24,18 +24,19 @@
     'app/android/library_loader_hooks.cc',
     'app/content_main.cc',
     'app/content_main_runner.cc',
-    'app/startup_helper_win.cc',
+    'app/mojo/mojo_init.cc',
+    'app/mojo/mojo_init.h',
     'public/app/android_library_loader_hooks.h',
     'public/app/content_main.h',
     'public/app/content_main_delegate.cc',
     'public/app/content_main_delegate.h',
     'public/app/content_main_runner.h',
-    'public/app/startup_helper_win.h',
   ],
   'conditions': [
-    ['OS=="win"', {
+    ['((OS=="linux" and os_posix==1 and use_aura==1) or OS=="android") and use_allocator!="none"', {
       'dependencies': [
-        '../sandbox/sandbox.gyp:sandbox',
+        # This is needed by app/content_main_runner.cc
+        '../base/allocator/allocator.gyp:allocator',
       ],
     }],
     ['OS=="android"', {
@@ -50,10 +51,23 @@
         '../build/android/cpufeatures.gypi',
       ],
     }],
+    ['OS=="win"', {
+      'dependencies': [
+        'content_startup_helper_win',
+      ],
+    }],
     ['OS=="ios"', {
       'sources!': [
         'app/content_main.cc',
+        'app/mojo/mojo_init.cc',
+        'app/mojo/mojo_init.h',
       ],
+    }, {  # OS!="ios"
+      'dependencies': [
+        '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
+        '../mojo/mojo_base.gyp:mojo_environment_chromium',
+        '../mojo/public/mojo_public.gyp:mojo_application_bindings',
+     ],
     }],
   ],
 }