Upstream version 7.36.149.0

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

diff --git a/src/courgette/courgette.gyp b/src/courgette/courgette.gyp
index 591e4e2..52db0fb 100644 (file)
--- a/src/courgette/courgette.gyp
+++ b/src/courgette/courgette.gyp
@@ -121,23 +121,13 @@
       'conditions': [
         [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
           'conditions': [
-            # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
-            ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
+            ['use_allocator!="none"', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
-        [ 'toolkit_uses_gtk == 1', {
-          'dependencies': [
-            # Workaround for gyp bug 69.
-            # Needed to handle the #include chain:
-            #   base/test_suite.h
-            #   gtk/gtk.h
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],
@@ -157,17 +147,6 @@
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
       ],
-      'conditions': [
-        [ 'toolkit_uses_gtk == 1', {
-          'dependencies': [
-            # Workaround for gyp bug 69.
-            # Needed to handle the #include chain:
-            #   base/test_suite.h
-            #   gtk/gtk.h
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
-      ],
     },
   ],
   'conditions': [