diff options
| author | primiano <primiano@chromium.org> | 2016-01-20 11:41:53 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-20 19:43:03 +0000 |
| commit | 43ed3c505becb6044f2c9b2fc889c426e3ee7083 (patch) | |
| tree | f6500d2dcdcfdd83a579e951ec83bf09f15b30c0 /base/allocator | |
| parent | 35ec0303600ed8564c1c0ef1376805ebde569c87 (diff) | |
| download | chromium_src-43ed3c505becb6044f2c9b2fc889c426e3ee7083.zip chromium_src-43ed3c505becb6044f2c9b2fc889c426e3ee7083.tar.gz chromium_src-43ed3c505becb6044f2c9b2fc889c426e3ee7083.tar.bz2 | |
Revert of Fix condition in allocator.gyp (patchset #1 id:1 of https://codereview.chromium.org/1610113003/ )
Reason for revert:
The Win bot is also broken. I give up for today.
https://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN/builds/10231/steps/compile/logs/stdio
Original issue's description:
> Fix condition in allocator.gyp
>
> Follow-up to crrev.com/1605023004 which re-broke the tree.
> Turns out win_use_allocator_shim == 1 by default, which defeated
> the conditional introduced by the previous CL.
>
> BUG=564618
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> R=thakis@chromium.org
>
> Committed: https://chromium.googlesource.com/chromium/src/+/35ec0303600ed8564c1c0ef1376805ebde569c87
TBR=thakis@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=564618
Review URL: https://codereview.chromium.org/1605093004
Cr-Commit-Position: refs/heads/master@{#370440}
Diffstat (limited to 'base/allocator')
| -rw-r--r-- | base/allocator/allocator.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index 402d6de..69ba35d 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -29,7 +29,7 @@ 'target_name': 'allocator', 'variables': { 'conditions': [ - ['use_allocator!="none" or (OS=="win" and win_use_allocator_shim==1)', { + ['use_allocator!="none" or win_use_allocator_shim==1', { 'allocator_target_type%': 'static_library', }, { 'allocator_target_type%': 'none', |