| 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': [ | 
| 11     { | 11     { | 
| 12       'target_name': 'allocator', | 12       'target_name': 'allocator', | 
| 13       'type': 'static_library', | 13       'type': 'static_library', | 
| 14       'include_dirs': [ | 14       'include_dirs': [ | 
| 15         '.', | 15         '.', | 
| 16         '<(tcmalloc_dir)/src/base', | 16         '<(tcmalloc_dir)/src/base', | 
| 17         '<(tcmalloc_dir)/src', | 17         '<(tcmalloc_dir)/src', | 
| 18         '../..', | 18         '../..', | 
| 19       ], | 19       ], | 
|  | 20       'defines': ['TCMALLOC_USE_DOUBLYLINKED_FREELIST',], | 
| 20       'direct_dependent_settings': { | 21       'direct_dependent_settings': { | 
| 21         'configurations': { | 22         'configurations': { | 
| 22           'Common_Base': { | 23           'Common_Base': { | 
| 23             'msvs_settings': { | 24             'msvs_settings': { | 
| 24               'VCLinkerTool': { | 25               'VCLinkerTool': { | 
| 25                 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'], | 26                 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'], | 
| 26                 'AdditionalDependencies': [ | 27                 'AdditionalDependencies': [ | 
| 27                   '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib' | 28                   '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib' | 
| 28                 ], | 29                 ], | 
| 29               }, | 30               }, | 
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 87         '<(tcmalloc_dir)/src/base/thread_annotations.h', | 88         '<(tcmalloc_dir)/src/base/thread_annotations.h', | 
| 88         '<(tcmalloc_dir)/src/base/thread_lister.c', | 89         '<(tcmalloc_dir)/src/base/thread_lister.c', | 
| 89         '<(tcmalloc_dir)/src/base/thread_lister.h', | 90         '<(tcmalloc_dir)/src/base/thread_lister.h', | 
| 90         '<(tcmalloc_dir)/src/base/vdso_support.cc', | 91         '<(tcmalloc_dir)/src/base/vdso_support.cc', | 
| 91         '<(tcmalloc_dir)/src/base/vdso_support.h', | 92         '<(tcmalloc_dir)/src/base/vdso_support.h', | 
| 92         '<(tcmalloc_dir)/src/central_freelist.cc', | 93         '<(tcmalloc_dir)/src/central_freelist.cc', | 
| 93         '<(tcmalloc_dir)/src/central_freelist.h', | 94         '<(tcmalloc_dir)/src/central_freelist.h', | 
| 94         '<(tcmalloc_dir)/src/common.cc', | 95         '<(tcmalloc_dir)/src/common.cc', | 
| 95         '<(tcmalloc_dir)/src/common.h', | 96         '<(tcmalloc_dir)/src/common.h', | 
| 96         '<(tcmalloc_dir)/src/debugallocation.cc', | 97         '<(tcmalloc_dir)/src/debugallocation.cc', | 
|  | 98         '<(tcmalloc_dir)/src/free_list.cc', | 
|  | 99         '<(tcmalloc_dir)/src/free_list.h', | 
| 97         '<(tcmalloc_dir)/src/getpc.h', | 100         '<(tcmalloc_dir)/src/getpc.h', | 
| 98         '<(tcmalloc_dir)/src/google/heap-checker.h', | 101         '<(tcmalloc_dir)/src/google/heap-checker.h', | 
| 99         '<(tcmalloc_dir)/src/google/heap-profiler.h', | 102         '<(tcmalloc_dir)/src/google/heap-profiler.h', | 
| 100         '<(tcmalloc_dir)/src/google/malloc_extension.h', | 103         '<(tcmalloc_dir)/src/google/malloc_extension.h', | 
| 101         '<(tcmalloc_dir)/src/google/malloc_extension_c.h', | 104         '<(tcmalloc_dir)/src/google/malloc_extension_c.h', | 
| 102         '<(tcmalloc_dir)/src/google/malloc_hook.h', | 105         '<(tcmalloc_dir)/src/google/malloc_hook.h', | 
| 103         '<(tcmalloc_dir)/src/google/malloc_hook_c.h', | 106         '<(tcmalloc_dir)/src/google/malloc_hook_c.h', | 
| 104         '<(tcmalloc_dir)/src/google/profiler.h', | 107         '<(tcmalloc_dir)/src/google/profiler.h', | 
| 105         '<(tcmalloc_dir)/src/google/stacktrace.h', | 108         '<(tcmalloc_dir)/src/google/stacktrace.h', | 
| 106         '<(tcmalloc_dir)/src/google/tcmalloc.h', | 109         '<(tcmalloc_dir)/src/google/tcmalloc.h', | 
| 107         '<(tcmalloc_dir)/src/heap-checker-bcad.cc', | 110         '<(tcmalloc_dir)/src/heap-checker-bcad.cc', | 
| 108         '<(tcmalloc_dir)/src/heap-checker.cc', | 111         '<(tcmalloc_dir)/src/heap-checker.cc', | 
| 109         '<(tcmalloc_dir)/src/heap-profile-table.cc', | 112         '<(tcmalloc_dir)/src/heap-profile-table.cc', | 
| 110         '<(tcmalloc_dir)/src/heap-profile-table.h', | 113         '<(tcmalloc_dir)/src/heap-profile-table.h', | 
| 111         '<(tcmalloc_dir)/src/heap-profiler.cc', | 114         '<(tcmalloc_dir)/src/heap-profiler.cc', | 
| 112         '<(tcmalloc_dir)/src/internal_logging.cc', | 115         '<(tcmalloc_dir)/src/internal_logging.cc', | 
| 113         '<(tcmalloc_dir)/src/internal_logging.h', | 116         '<(tcmalloc_dir)/src/internal_logging.h', | 
| 114         '<(tcmalloc_dir)/src/linked_list.h', |  | 
| 115         '<(tcmalloc_dir)/src/malloc_extension.cc', | 117         '<(tcmalloc_dir)/src/malloc_extension.cc', | 
| 116         '<(tcmalloc_dir)/src/malloc_hook-inl.h', | 118         '<(tcmalloc_dir)/src/malloc_hook-inl.h', | 
| 117         '<(tcmalloc_dir)/src/malloc_hook.cc', | 119         '<(tcmalloc_dir)/src/malloc_hook.cc', | 
| 118         '<(tcmalloc_dir)/src/maybe_threads.cc', | 120         '<(tcmalloc_dir)/src/maybe_threads.cc', | 
| 119         '<(tcmalloc_dir)/src/maybe_threads.h', | 121         '<(tcmalloc_dir)/src/maybe_threads.h', | 
| 120         '<(tcmalloc_dir)/src/memfs_malloc.cc', | 122         '<(tcmalloc_dir)/src/memfs_malloc.cc', | 
| 121         '<(tcmalloc_dir)/src/memory_region_map.cc', | 123         '<(tcmalloc_dir)/src/memory_region_map.cc', | 
| 122         '<(tcmalloc_dir)/src/memory_region_map.h', | 124         '<(tcmalloc_dir)/src/memory_region_map.h', | 
| 123         '<(tcmalloc_dir)/src/packed-cache-inl.h', | 125         '<(tcmalloc_dir)/src/packed-cache-inl.h', | 
| 124         '<(tcmalloc_dir)/src/page_heap.cc', | 126         '<(tcmalloc_dir)/src/page_heap.cc', | 
| (...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 430                 '$(VCInstallDir)lib', | 432                 '$(VCInstallDir)lib', | 
| 431                 '<(SHARED_INTERMEDIATE_DIR)/allocator', | 433                 '<(SHARED_INTERMEDIATE_DIR)/allocator', | 
| 432               ], | 434               ], | 
| 433             }, | 435             }, | 
| 434           ], | 436           ], | 
| 435         }, | 437         }, | 
| 436       ], | 438       ], | 
| 437     }], | 439     }], | 
| 438   ], | 440   ], | 
| 439 } | 441 } | 
| OLD | NEW | 
|---|