Convert the existing .gyp configuration to use the new base\allocator

library with upstream source code from the new vendor branch patterns
in third_party\jemalloc and third_party\tcmalloc.
BUG=27911
TEST=none
Review URL: http://codereview.chromium.org/435040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33208 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 37 insertions, 25 deletions

diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index 1e65bca..a0ba1f92 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -204,7 +204,6 @@
         }],
         ['OS=="linux"', {
           'sources!': [
-            '<(tcmalloc_dir)/src/page_heap.cc',
             '<(tcmalloc_dir)/src/system-alloc.h',
             '<(tcmalloc_dir)/src/windows/port.cc',
             '<(tcmalloc_dir)/src/windows/port.h',
@@ -219,6 +218,18 @@
             '<(jemalloc_dir)/ql.h',
             '<(jemalloc_dir)/qr.h',
             '<(jemalloc_dir)/rb.h',
+
+            # TODO(willchan):  Return to using this when page_heap_linux.cc
+            # becomes unnecessary.
+            '<(tcmalloc_dir)/src/page_heap.cc',
+          ],
+          # TODO(willchan):  This is actually just a branched copy of the
+          # vanilla upstream page_heap.cc.  The current forked copy of
+          # page_heap.cc has Windows-specific code in it so Linux can't
+          # use it.  These need to be refactored so we can track changes
+          # to the upstream page_heap.cc without duplication.
+          'sources': [
+            '<(tcmalloc_dir)/src/page_heap_linux.cc',
           ],
           'cflags!': [
             '-fvisibility=hidden',
diff --git a/base/base.gyp b/base/base.gyp
index d225ef3..7238928 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -697,7 +697,7 @@
           'conditions': [
             [ 'linux_use_tcmalloc==1', {
                 'dependencies': [
-                  '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+                  'allocator/allocator.gyp:allocator',
                 ],
               },
             ],
diff --git a/build/all.gyp b/build/all.gyp
index 9223569..85849ed 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -86,6 +86,7 @@
         }],
         ['OS=="win"', {
           'dependencies': [
+            '../base/allocator/allocator.gyp:*',
             '../breakpad/breakpad.gyp:*',
             '../chrome/app/locales/locales.gyp:*',
             '../courgette/courgette.gyp:*',
@@ -95,7 +96,6 @@
             '../third_party/bsdiff/bsdiff.gyp:*',
             '../third_party/bspatch/bspatch.gyp:*',
             '../third_party/cld/cld.gyp:*',
-            '../third_party/tcmalloc/tcmalloc.gyp:*',
             '../tools/memory_watcher/memory_watcher.gyp:*',
           ],
         }, {
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index e3cc815..c921070 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -33,6 +33,7 @@
       '../printing/printing.gyp:printing',
       '../webkit/webkit.gyp:inspector_resources',
     ],
+    'allocator_target': '../base/allocator/allocator.gyp:allocator',
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
     'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
     'chrome_strings_grds': [
@@ -2725,9 +2726,9 @@
             '../gears/gears.gyp:gears',
             '../google_update/google_update.gyp:google_update',
             '../third_party/cld/cld.gyp:cld',
-            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
             '../views/views.gyp:views',
             'installer/installer.gyp:installer_util',
+            '<(allocator_target)',
           ],
           'export_dependent_settings': [
             '../views/views.gyp:views',
@@ -3412,10 +3413,10 @@
             'third_party/wtl/include',
           ],
           'dependencies': [
-            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+            '<(allocator_target)',
           ],
           'export_dependent_settings': [
-            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+            '<(allocator_target)',
           ],
         },],
       ],
@@ -3564,7 +3565,7 @@
           'conditions': [
             [ 'linux_use_tcmalloc==1', {
                 'dependencies': [
-                  '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+                  '<(allocator_target)',
                 ],
               },
             ],
@@ -4209,7 +4210,7 @@
             'third_party/wtl/include',
           ],
           'dependencies': [
-            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+            '<(allocator_target)',
           ],
         }],
       ],
@@ -4339,7 +4340,7 @@
             '../views/views.gyp:views',
             # run time dependency
             '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin',
-            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+            '<(allocator_target)',
           ],
           'link_settings': {
             'libraries': [
@@ -4410,7 +4411,7 @@
             '../views/views.gyp:views',
             # run time dependency
             '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin',
-            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+            '<(allocator_target)',
           ],
           'link_settings': {
             'libraries': [
@@ -4911,7 +4912,7 @@
             'installer/installer.gyp:installer_util_strings',
             '../views/views.gyp:views',
             'test_chrome_plugin',  # run time dependency
-            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+            '<(allocator_target)',
           ],
           'include_dirs': [
             'third_party/wtl/include',
@@ -5040,7 +5041,7 @@
           'dependencies': [
             'chrome_dll_version',
             'installer/installer.gyp:installer_util_strings',
-            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+            '<(allocator_target)',
           ],
           'configurations': {
             'Debug': {
@@ -5129,7 +5130,7 @@
         }],
         ['OS=="win"', {
           'dependencies': [
-            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+            '<(allocator_target)',
           ],
         },],
       ],
@@ -5164,7 +5165,7 @@
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
-            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+            '<(allocator_target)',
           ],
         },],
         ['OS=="linux"', {
@@ -5268,7 +5269,7 @@
         }],
         ['OS=="win"', {
           'dependencies': [
-            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+            '<(allocator_target)',
           ],
         },],
       ],
@@ -5329,7 +5330,7 @@
             'third_party/wtl/include',
           ],
           'dependencies': [
-            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+            '<(allocator_target)',
           ],
         }], # OS="win"
       ], # conditions
@@ -5530,7 +5531,7 @@
             'browser/sync/util/data_encryption_unittest.cc',
           ],
           'dependencies': [
-            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+            '<(allocator_target)',
           ],
           'link_settings': {
             'libraries': [
@@ -6447,7 +6448,7 @@
                 },
               },
               'dependencies': [
-                '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+                '<(allocator_target)',
               ],
             }],
           ],
@@ -6510,6 +6511,7 @@
             'installer/mini_installer.gyp:*',
             'installer/installer.gyp:*',
             '../app/app.gyp:*',
+            '../base/allocator/allocator.gyp:*',
             '../base/base.gyp:*',
             '../ipc/ipc.gyp:*',
             '../media/media.gyp:*',
@@ -6534,7 +6536,6 @@
             '../third_party/modp_b64/modp_b64.gyp:*',
             '../third_party/npapi/npapi.gyp:*',
             '../third_party/sqlite/sqlite.gyp:*',
-            '../third_party/tcmalloc/tcmalloc.gyp:*',
             '../third_party/zlib/zlib.gyp:*',
             '../webkit/tools/test_shell/test_shell.gyp:*',
             '../webkit/webkit.gyp:*',
@@ -6725,7 +6726,7 @@
                   'chrome_dll_version',
                   'installer/installer.gyp:installer_util_strings',
                   '../views/views.gyp:views',
-                  '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+                  '<(allocator_target)',
                 ],
                 'configurations': {
                   'Debug': {
@@ -6785,7 +6786,7 @@
           'conditions': [
             ['OS=="win"', {
               'dependencies': [
-                '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+                '<(allocator_target)',
               ],
               'configurations': {
                 'Debug': {
@@ -6825,7 +6826,7 @@
           'conditions': [
             ['OS=="win"', {
               'dependencies': [
-                '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+                '<(allocator_target)',
               ],
             },],
           ],
@@ -6868,7 +6869,7 @@
           'conditions': [
             ['OS=="win"', {
               'dependencies': [
-                '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+                '<(allocator_target)',
               ],
             },],
           ],
diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi
index b515193..6988316 100644
--- a/chrome/test/interactive_ui/interactive_ui_tests.gypi
+++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi
@@ -96,11 +96,11 @@
       ],
       'dependencies': [
         '<(DEPTH)/app/app.gyp:app_resources',
+        '<(DEPTH)/base/allocator/allocator.gyp:allocator',
         '<(DEPTH)/chrome/chrome.gyp:chrome_dll_version',
         '<(DEPTH)/chrome/chrome.gyp:crash_service',  # run time dependency
         '<(DEPTH)/chrome/installer/installer.gyp:installer_util_strings',
         '<(DEPTH)/views/views.gyp:views',
-        '<(DEPTH)/third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
       ],
       'sources': [
         '<(DEPTH)/webkit/glue/resources/aliasb.cur',
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 9135328..7a7b61e 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -293,7 +293,7 @@
           'conditions': [
             [ 'linux_use_tcmalloc==1', {
                 'dependencies': [
-                  '../../../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+                  '../../../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],