diff options
| author | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-19 20:35:09 +0000 |
|---|---|---|
| committer | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-19 20:35:09 +0000 |
| commit | a598461b32226634152c88d9357d81bd0a7d3e6b (patch) | |
| tree | f150bffbf0405321f379b984b1697f1fc5977454 /base | |
| parent | 6ed0f0e9d0289c607c0fe75cd072e9a1a7177599 (diff) | |
| download | chromium_src-a598461b32226634152c88d9357d81bd0a7d3e6b.zip chromium_src-a598461b32226634152c88d9357d81bd0a7d3e6b.tar.gz chromium_src-a598461b32226634152c88d9357d81bd0a7d3e6b.tar.bz2 | |
Make allocator_unittests a Win-only target.
It doesn't build on Linux and Mac.
BUG=118376
TEST=none
Review URL: http://codereview.chromium.org/9720046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127522 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/allocator/allocator.gyp | 38 | ||||
| -rw-r--r-- | base/allocator/allocator_unittests.cc | 3 |
2 files changed, 20 insertions, 21 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index 873e2d7..d8763d5 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -423,26 +423,7 @@ }], ], }, - { - 'target_name': 'allocator_unittests', - 'type': 'executable', - 'dependencies': [ - 'allocator', - '../../testing/gtest.gyp:gtest', - ], - 'include_dirs': [ - '.', - '<(tcmalloc_dir)/src/base', - '<(tcmalloc_dir)/src', - '../..', - ], - 'sources': [ - 'allocator_unittests.cc', - '../profiler/alternate_timer.cc', - '../profiler/alternate_timer.h', ], - }, - ], 'conditions': [ ['OS=="win"', { 'targets': [ @@ -466,6 +447,25 @@ }, ], }, + { + 'target_name': 'allocator_unittests', + 'type': 'executable', + 'dependencies': [ + 'allocator', + '../../testing/gtest.gyp:gtest', + ], + 'include_dirs': [ + '.', + '<(tcmalloc_dir)/src/base', + '<(tcmalloc_dir)/src', + '../..', + ], + 'sources': [ + 'allocator_unittests.cc', + '../profiler/alternate_timer.cc', + '../profiler/alternate_timer.h', + ], + }, ], }], ], diff --git a/base/allocator/allocator_unittests.cc b/base/allocator/allocator_unittests.cc index d6556ce..a40afdf 100644 --- a/base/allocator/allocator_unittests.cc +++ b/base/allocator/allocator_unittests.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -6,7 +6,6 @@ #include <stdlib.h> #include <algorithm> // for min() #include "base/atomicops.h" -#include "base/logging.h" #include "testing/gtest/include/gtest/gtest.h" // Number of bits in a size_t. |