allocator.gyp target needs to be conditionally included in compositor.gyp

ui/gfx/compositor/compositor.gyp

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'target_defaults': {
     'sources/': [
@@ skipping 101 matching lines @@
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
       ],
       'sources': [
         'compositor_test_support.cc',
         'compositor_test_support.h',
       ],
       'conditions': [
         ['use_webkit_compositor == 1', {
             'dependencies': [

[oshima, 2011/11/17 22:22:31]

can you fix indent here?

[dhollowa, 2011/11/17 22:28:23]

Done.

-              '<(DEPTH)/base/allocator/allocator.gyp:allocator',
               '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
               '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
             ],
         }],
+        ['os_posix == 1 and OS != "mac"', {

[oshima, 2011/11/17 22:22:31]

It's a bit strange to be nested (could have just be
"os_posix == 1 and OS != "mac" and linux_use_tcmalloc==1")
but looks like this is common pattern.

[dhollowa, 2011/11/17 22:28:23]

Yes.  I followed the pattern.

+          'conditions': [
+            ['linux_use_tcmalloc==1', {
+              'dependencies': [
+                '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ],
+        }],
       ],
     },
     {
       'target_name': 'compositor_unittests',
       'type': 'executable',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
         '<(DEPTH)/skia/skia.gyp:skia',
@@ skipping 57 matching lines @@
             'test_compositor.cc',
             'test_compositor.h',
             'test_texture.cc',
             'test_texture.h',
           ],
         }],
       ],
     },
   ],
 }