| OLD | NEW | 
|---|
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 { | 5 { | 
| 6   'variables': { | 6   'variables': { | 
| 7     'jemalloc_dir': '../../third_party/jemalloc/chromium', | 7     'jemalloc_dir': '../../third_party/jemalloc/chromium', | 
| 8     'tcmalloc_dir': '../../third_party/tcmalloc/chromium', | 8     'tcmalloc_dir': '../../third_party/tcmalloc/chromium', | 
| 9   }, | 9   }, | 
| 10   'targets': [ | 10   'targets': [ | 
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 87         '<(tcmalloc_dir)/src/base/thread_annotations.h', | 87         '<(tcmalloc_dir)/src/base/thread_annotations.h', | 
| 88         '<(tcmalloc_dir)/src/base/thread_lister.c', | 88         '<(tcmalloc_dir)/src/base/thread_lister.c', | 
| 89         '<(tcmalloc_dir)/src/base/thread_lister.h', | 89         '<(tcmalloc_dir)/src/base/thread_lister.h', | 
| 90         '<(tcmalloc_dir)/src/base/vdso_support.cc', | 90         '<(tcmalloc_dir)/src/base/vdso_support.cc', | 
| 91         '<(tcmalloc_dir)/src/base/vdso_support.h', | 91         '<(tcmalloc_dir)/src/base/vdso_support.h', | 
| 92         '<(tcmalloc_dir)/src/central_freelist.cc', | 92         '<(tcmalloc_dir)/src/central_freelist.cc', | 
| 93         '<(tcmalloc_dir)/src/central_freelist.h', | 93         '<(tcmalloc_dir)/src/central_freelist.h', | 
| 94         '<(tcmalloc_dir)/src/common.cc', | 94         '<(tcmalloc_dir)/src/common.cc', | 
| 95         '<(tcmalloc_dir)/src/common.h', | 95         '<(tcmalloc_dir)/src/common.h', | 
| 96         '<(tcmalloc_dir)/src/debugallocation.cc', | 96         '<(tcmalloc_dir)/src/debugallocation.cc', | 
|  | 97         '<(tcmalloc_dir)/src/free_list.cc', | 
|  | 98         '<(tcmalloc_dir)/src/free_list.h', | 
| 97         '<(tcmalloc_dir)/src/getpc.h', | 99         '<(tcmalloc_dir)/src/getpc.h', | 
| 98         '<(tcmalloc_dir)/src/google/heap-checker.h', | 100         '<(tcmalloc_dir)/src/google/heap-checker.h', | 
| 99         '<(tcmalloc_dir)/src/google/heap-profiler.h', | 101         '<(tcmalloc_dir)/src/google/heap-profiler.h', | 
| 100         '<(tcmalloc_dir)/src/google/malloc_extension.h', | 102         '<(tcmalloc_dir)/src/google/malloc_extension.h', | 
| 101         '<(tcmalloc_dir)/src/google/malloc_extension_c.h', | 103         '<(tcmalloc_dir)/src/google/malloc_extension_c.h', | 
| 102         '<(tcmalloc_dir)/src/google/malloc_hook.h', | 104         '<(tcmalloc_dir)/src/google/malloc_hook.h', | 
| 103         '<(tcmalloc_dir)/src/google/malloc_hook_c.h', | 105         '<(tcmalloc_dir)/src/google/malloc_hook_c.h', | 
| 104         '<(tcmalloc_dir)/src/google/profiler.h', | 106         '<(tcmalloc_dir)/src/google/profiler.h', | 
| 105         '<(tcmalloc_dir)/src/google/stacktrace.h', | 107         '<(tcmalloc_dir)/src/google/stacktrace.h', | 
| 106         '<(tcmalloc_dir)/src/google/tcmalloc.h', | 108         '<(tcmalloc_dir)/src/google/tcmalloc.h', | 
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 257         'VCLibrarianTool': { | 259         'VCLibrarianTool': { | 
| 258           'AdditionalOptions': ['/ignore:4006,4221'], | 260           'AdditionalOptions': ['/ignore:4006,4221'], | 
| 259           'AdditionalLibraryDirectories': | 261           'AdditionalLibraryDirectories': | 
| 260             ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], | 262             ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], | 
| 261         }, | 263         }, | 
| 262         'VCLinkerTool': { | 264         'VCLinkerTool': { | 
| 263           'AdditionalOptions': ['/ignore:4006'], | 265           'AdditionalOptions': ['/ignore:4006'], | 
| 264         }, | 266         }, | 
| 265       }, | 267       }, | 
| 266       'configurations': { | 268       'configurations': { | 
|  | 269         'Debug': { | 
|  | 270           'defines': | 
|  | 271           ['TCMALLOC_USE_DOUBLYLINKED_FREELIST'], | 
|  | 272         }, | 
| 267         'Debug_Base': { | 273         'Debug_Base': { | 
| 268           'msvs_settings': { | 274           'msvs_settings': { | 
| 269             'VCCLCompilerTool': { | 275             'VCCLCompilerTool': { | 
| 270               'RuntimeLibrary': '0', | 276               'RuntimeLibrary': '0', | 
| 271             }, | 277             }, | 
| 272           }, | 278           }, | 
| 273         }, | 279         }, | 
| 274       }, | 280       }, | 
| 275       'conditions': [ | 281       'conditions': [ | 
| 276         ['OS=="win"', { | 282         ['OS=="win"', { | 
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 430                 '$(VCInstallDir)lib', | 436                 '$(VCInstallDir)lib', | 
| 431                 '<(SHARED_INTERMEDIATE_DIR)/allocator', | 437                 '<(SHARED_INTERMEDIATE_DIR)/allocator', | 
| 432               ], | 438               ], | 
| 433             }, | 439             }, | 
| 434           ], | 440           ], | 
| 435         }, | 441         }, | 
| 436       ], | 442       ], | 
| 437     }], | 443     }], | 
| 438   ], | 444   ], | 
| 439 } | 445 } | 
| OLD | NEW | 
|---|