Upstream version 7.36.149.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 6187bce..0a873a4 100644 (file)
--- a/src/content/content_app.gypi
+++ b/src/content/content_app.gypi
@@ -35,6 +35,12 @@
     'public/app/startup_helper_win.h',
   ],
   'conditions': [
+    ['((OS=="linux" and os_posix==1 and use_aura==1) or OS=="android") and use_allocator!="none"', {
+      'dependencies': [
+        # This is needed by app/content_main_runner.cc
+        '../base/allocator/allocator.gyp:allocator',
+      ],
+    }],
     ['OS=="win"', {
       'dependencies': [
         '../sandbox/sandbox.gyp:sandbox',
@@ -55,18 +61,14 @@
     ['OS=="ios"', {
       'sources!': [
         'app/content_main.cc',
-      ],
-    }],
-    ['use_mojo==0', {
-      'sources!': [
         'app/mojo/mojo_init.cc',
         'app/mojo/mojo_init.h',
       ],
-    }, {
+    }, {  # OS!="ios"
       'dependencies': [
         '../mojo/mojo.gyp:mojo_environment_chromium',
         '../mojo/mojo.gyp:mojo_service_manager',
-        '../mojo/mojo.gyp:mojo_system',
+        '../mojo/mojo.gyp:mojo_shell_bindings',
         '../mojo/mojo.gyp:mojo_system_impl',
      ],
     }],