Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / compositor / compositor.gyp

diff --git a/src/ui/compositor/compositor.gyp b/src/ui/compositor/compositor.gyp
index 18f6c8c..2822397 100644 (file)
--- a/src/ui/compositor/compositor.gyp
+++ b/src/ui/compositor/compositor.gyp
@@ -120,7 +120,8 @@
       'conditions': [
         ['use_x11==1', {
           'dependencies': [
-            '<(DEPTH)/build/linux/system.gyp:x11'
+            '<(DEPTH)/build/linux/system.gyp:x11',
+            '<(DEPTH)/ui/gfx/gfx.gyp:gfx_x11',
           ]
         }]
       ]
@@ -147,6 +148,7 @@
         'layer_animation_element_unittest.cc',
         'layer_animation_sequence_unittest.cc',
         'layer_animator_unittest.cc',
+        'layer_owner_unittest.cc',
         'layer_unittest.cc',
         'run_all_unittests.cc',
         'transform_animation_curve_adapter_unittest.cc',
@@ -160,8 +162,7 @@
         }],
         ['os_posix == 1 and OS != "mac"', {
           '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': [
                 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
               ],