Merge pull request #170 from tmpsantos/glib_mainloop2

[Extensions] Build glib message pump on Ozone
crosswalk-project · Jun 18, 2014 · 6488cb7 · 6488cb7
2 parents f7a23f7 + d7e13fe
commit 6488cb7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/base/base.gyp b/base/base.gyp
@@ -54,7 +54,7 @@
               ['exclude', '_nss\\.cc$'],
             ],
         }],
-        ['use_glib==1', {
+        ['use_glib==1 or <(use_ozone)==1', {
           'dependencies': [
             '../build/linux/system.gyp:glib',
           ],

diff --git a/base/base.gypi b/base/base.gypi
@@ -728,7 +728,7 @@
                 'atomicops_internals_x86_gcc.cc',
               ],
           }],
-          ['<(use_glib)==0 or >(nacl_untrusted_build)==1', {
+          ['(<(use_glib)==0 and <(use_ozone)==0) or >(nacl_untrusted_build)==1', {
               'sources!': [
                 'message_loop/message_pump_glib.cc',
               ],