diff options
86 files changed, 2 insertions, 722 deletions
diff --git a/ash/BUILD.gn b/ash/BUILD.gn index 25a2691..ced0d8b 100644 --- a/ash/BUILD.gn +++ b/ash/BUILD.gn @@ -289,7 +289,6 @@ test("ash_unittests") { "//ash/resources", "//ash/strings", "//base", - "//base/allocator", "//base/test:test_support", "//components/signin/core/account_id", "//components/user_manager", @@ -378,10 +377,6 @@ test("ash_unittests") { sources -= [ "touch/touch_transformer_controller_unittest.cc" ] } - # TODO(GYP) is this necessary? - #['OS=="linux" and component=="shared_library" and use_allocator!="none"', { - # ldflags = "-rdynamic" - if (!is_chromeos) { sources -= [ "sticky_keys/sticky_keys_unittest.cc" ] } diff --git a/ash/ash.gyp b/ash/ash.gyp index 24b3f9e..32c8b35 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -1213,11 +1213,6 @@ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], }], - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], ['chromeos==1', { 'dependencies': [ '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock', @@ -1240,14 +1235,6 @@ 'touch/touchscreen_util_unittest.cc', ], }], - ['OS=="linux" and component=="shared_library" and use_allocator!="none"', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - 'link_settings': { - 'ldflags': ['-rdynamic'], - }, - }], ], }, { @@ -1335,11 +1322,6 @@ '../device/bluetooth/bluetooth.gyp:device_bluetooth', ], }], - ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], ], }, ], diff --git a/build/all.gyp b/build/all.gyp index 6f1aba9..406ebaf 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -215,13 +215,6 @@ ], }], ['OS=="win"', { - 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:*', - ], - }], - ], 'dependencies': [ '../chrome/tools/crash_service/caps/caps.gyp:*', '../chrome_elf/chrome_elf.gyp:*', diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp index 94f1105..0bb4507 100644 --- a/cc/cc_tests.gyp +++ b/cc/cc_tests.gyp @@ -352,19 +352,6 @@ ], } ], - [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', - { - 'conditions': [ - [ 'use_allocator!="none"', - { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - } - ], - ], - } - ], ], }, { @@ -412,14 +399,6 @@ ], } ], - # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and use_allocator!="none"', - { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - } - ], ], }, { diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index db8d6d6..d3e7daf 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -178,7 +178,6 @@ if (!is_android) { ":browser_dependencies", ":child_dependencies", ":manpage", - "//base/allocator", # Needed to use the master_preferences functions "//chrome/installer/util:with_no_strings", @@ -293,7 +292,6 @@ if (is_mac || is_win) { deps = [ ":browser_dependencies", - "//base/allocator", "//build/config/sanitizers:deps", ] if (is_win) { @@ -394,7 +392,6 @@ if (is_mac || is_win) { ":child_dependencies", ":chrome_child_manifest", ":chrome_dll_version", - "//base/allocator", "//build/config/sanitizers:deps", "//components/browser_watcher:browser_watcher_client", "//components/crash/content/app", diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp index d6d3312..47f2541 100644 --- a/chrome/android/chrome_apk.gyp +++ b/chrome/android/chrome_apk.gyp @@ -127,11 +127,6 @@ }], ], }], # order_profiling!=0 - ['use_allocator!="none"', { - 'dependencies': [ - '../../base/allocator/allocator.gyp:allocator', - ], - }], ], }, { diff --git a/chrome/browser/resources/chromeos/chromevox/BUILD.gn b/chrome/browser/resources/chromeos/chromevox/BUILD.gn index 23b5f99..8c015ed 100644 --- a/chrome/browser/resources/chromeos/chromevox/BUILD.gn +++ b/chrome/browser/resources/chromeos/chromevox/BUILD.gn @@ -316,7 +316,6 @@ test("chromevox_tests") { ":chromevox_unitjs_tests", "//base", "//base:i18n", - "//base/allocator", "//base/test:test_support", "//chrome:browser_tests_pak", "//chrome:packed_extra_resources", diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi b/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi index 5d43b38..e6c0f82 100644 --- a/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi +++ b/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi @@ -125,11 +125,6 @@ '<(DEPTH)/native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp:nacl_helper_bootstrap', ], }], - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], ], 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER', diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index e0dc0d9..b309a66 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -22,7 +22,6 @@ 'common', '../sync/sync.gyp:sync', ], - 'allocator_target': '../base/allocator/allocator.gyp:allocator', 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', 'conditions': [ diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 0f781cd..de456dd 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -248,11 +248,6 @@ }, }, 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '<(allocator_target)', - ], - }], ['enable_basic_printing==1 or enable_print_preview==1', { 'dependencies': [ '../printing/printing.gyp:printing', @@ -365,11 +360,6 @@ 'app/chrome_main_delegate.h', ], 'conditions': [ - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(allocator_target)', - ], - }], ['OS=="win"', { 'conditions': [ ['chrome_pgo_phase!=0', { diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 3463221..41150ff 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -160,12 +160,6 @@ }, ], 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '<(allocator_target)', - ], - }, - ], ['profiling==0 and linux_disable_pie==0', { 'ldflags': [ '-pie', diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index 7735229..407fe04 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -322,11 +322,6 @@ }, }, }], - ['win_use_allocator_shim==1', { - 'dependencies': [ - '<(allocator_target)', - ], - }], ], }, { @@ -370,13 +365,6 @@ 'installer/setup/setup_util_unittest.h', 'installer/setup/update_active_setup_version_work_item_unittest.cc', ], - 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '<(allocator_target)', - ], - }], - ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], }, diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 62161e6..ec1fd7f 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1828,13 +1828,6 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', ], - 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], 'msvs_settings': { 'VCLinkerTool': { 'conditions': [ @@ -2419,13 +2412,6 @@ 'dependencies': [ 'chrome_version_resources', ], - 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '<(allocator_target)', - ], - }], - ], }, { # else: OS != "win" 'sources!': [ 'app/chrome_command_ids.h', @@ -2524,15 +2510,6 @@ 'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc', ], }], - ['os_posix == 1 and OS != "mac" and OS != "android"', { - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], ['chromeos == 1', { 'sources': [ 'browser/extensions/api/networking_private/networking_private_apitest.cc', @@ -2749,13 +2726,6 @@ 'dependencies': [ 'chrome_version_resources', ], - 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '<(allocator_target)', - ], - }], - ], 'configurations': { 'Debug_Base': { 'msvs_settings': { @@ -2804,20 +2774,6 @@ 'test/perf/mach_ports_performancetest.cc', ], }], - ['os_posix == 1 and OS != "mac" and OS != "android"', { - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], - ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], ], # conditions }, # target performance_browser_tests { @@ -2954,13 +2910,6 @@ 'dependencies': [ 'chrome_version_resources', ], - 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '<(allocator_target)', - ], - }], - ], 'configurations': { 'Debug': { 'msvs_settings': { @@ -3061,13 +3010,6 @@ 'dependencies': [ 'chrome_version_resources', ], - 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '<(allocator_target)', - ], - }], - ], 'configurations': { 'Debug': { 'msvs_settings': { diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 9a292c1..03aa18b 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -2603,15 +2603,6 @@ }, }, }], - ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], ['OS=="mac"', { # The test fetches resources which means Mac need the app bundle to # exist on disk so it can pull from it. @@ -2699,11 +2690,6 @@ '../third_party/isimpledom/isimpledom.gyp:isimpledom', ], 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '<(allocator_target)', - ], - }], ['branding!="Chrome"', { 'sources!': [ 'browser/google/google_update_win_unittest.cc', @@ -2925,13 +2911,6 @@ '../breakpad/breakpad.gyp:*', '../components/components.gyp:crash_component', ], - 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '<(allocator_target)', - ], - }], - ], }], ], }, diff --git a/chrome/installer/setup/BUILD.gn b/chrome/installer/setup/BUILD.gn index ca52311..efb176b 100644 --- a/chrome/installer/setup/BUILD.gn +++ b/chrome/installer/setup/BUILD.gn @@ -22,7 +22,6 @@ if (is_win) { deps = [ ":lib", - "//base/allocator", "//build/config/sanitizers:deps", "//components/crash/content/app:app_breakpad_mac_win_to_be_deleted", ] @@ -83,7 +82,6 @@ if (is_win) { ":lib", "//base", "//base:i18n", - "//base/allocator", "//base/test:test_support", "//chrome/installer/mini_installer:unit_tests", "//testing/gmock", diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 648869a..c24d62a 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -337,7 +337,6 @@ if (!is_android) { deps = [ ":test_support", ":test_support_ui", - "//base/allocator", "//chrome:packed_extra_resources", "//chrome:packed_resources", "//chrome:resources", @@ -850,7 +849,6 @@ if (!is_android) { ":test_support_ui", "//base", "//base:i18n", - "//base/allocator", "//base/test:test_support", "//chrome:browser_tests_pak", "//chrome:packed_extra_resources", @@ -1316,7 +1314,6 @@ if (!is_android) { ":sync_integration_test_support", ":test_support", ":test_support_ui", - "//base/allocator", "//chrome:packed_extra_resources", "//chrome:packed_resources", "//chrome:resources", @@ -1400,7 +1397,6 @@ if (!is_android) { deps = [ ":sync_integration_test_support", ":test_support_ui", - "//base/allocator", "//crypto:platform", "//sync", "//testing/gmock", @@ -1563,7 +1559,6 @@ test("unit_tests") { "//testing/gtest", # 3) anything tests directly depend on - "//base/allocator", "//chrome:resources", "//chrome:strings", "//components/safe_browsing_db:test_database_manager", @@ -2131,7 +2126,6 @@ if (is_win || (is_linux && !is_chromeos)) { ] deps = [ ":test_support", - "//base/allocator", "//base/test:run_all_unittests", "//base/test:test_support", "//breakpad:client", @@ -2161,7 +2155,6 @@ if (is_win || (is_linux && !is_chromeos)) { ":test_support_ui", "//base", "//base:i18n", - "//base/allocator", "//base/test:test_support", "//chrome/browser", "//chrome/renderer", diff --git a/chrome/tools/service_discovery_sniffer/BUILD.gn b/chrome/tools/service_discovery_sniffer/BUILD.gn index 0f895c5..9b8b2c9 100644 --- a/chrome/tools/service_discovery_sniffer/BUILD.gn +++ b/chrome/tools/service_discovery_sniffer/BUILD.gn @@ -13,7 +13,6 @@ executable("service_discovery_sniffer") { deps = [ "//base", - "//base/allocator", "//base/test:test_support", "//build/config/sanitizers:deps", "//chrome/browser", diff --git a/chromeos/BUILD.gn b/chromeos/BUILD.gn index 9993497..3cecead 100644 --- a/chromeos/BUILD.gn +++ b/chromeos/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/config/allocator.gni") import("//build/config/ui.gni") import("//testing/test.gni") import("//third_party/protobuf/proto_library.gni") @@ -162,9 +161,6 @@ test("chromeos_unittests") { "//url", ] sources = gypi_values.chromeos_test_sources - if (use_allocator != "none") { - deps += [ "//base/allocator" ] - } if (use_binder) { if (target_cpu == "arm" || target_cpu == "x86") { defines += [ "BINDER_IPC_32BIT" ] diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp index 066a558..2aeeec8 100644 --- a/chromeos/chromeos.gyp +++ b/chromeos/chromeos.gyp @@ -671,12 +671,6 @@ '..', ], 'conditions': [ - [ 'use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }, - ], ['use_binder == 1', { 'sources': [ '<@(chromeos_binder_test_sources)' ], 'conditions': [ diff --git a/cloud_print/cloud_print.gyp b/cloud_print/cloud_print.gyp index 8da7195..ca463c7 100644 --- a/cloud_print/cloud_print.gyp +++ b/cloud_print/cloud_print.gyp @@ -54,12 +54,6 @@ 'virtual_driver/win/virtual_driver.gyp:gcp_portmon_lib', ], }], - # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], ], 'msvs_settings': { 'VCLinkerTool': { diff --git a/components/components_tests.gyp b/components/components_tests.gyp index ff5ebe7..a0fe34b 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -1155,11 +1155,6 @@ 'components.gyp:browser_watcher_client', ] }], - ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], [ 'cld_version==2', { 'dependencies': [ # Unit tests should always use statically-linked CLD data. @@ -1457,19 +1452,6 @@ ['exclude', '^storage_monitor/'], ], }], - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ['OS=="linux" and component=="shared_library" and use_allocator!="none"', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - 'link_settings': { - 'ldflags': ['-rdynamic'], - }, - }], ['configuration_policy==1', { 'dependencies': [ 'components.gyp:policy_component', @@ -1723,11 +1705,6 @@ '../testing/android/native_test.gyp:native_test_native_code', ], }], - ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], @@ -1825,11 +1802,6 @@ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], }], - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], ['OS=="mac"', { 'dependencies': [ '../content/content_shell_and_tests.gyp:content_shell', # Needed for Content Shell.app's Helper. diff --git a/components/nacl.gyp b/components/nacl.gyp index a9ed69c..efac91e 100644 --- a/components/nacl.gyp +++ b/components/nacl.gyp @@ -254,15 +254,6 @@ '../build/linux/system.gyp:glib', ], }], - ['os_posix == 1 and OS != "mac"', { - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], ['use_seccomp_bpf == 0', { 'sources!': [ '../content/common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', diff --git a/components/test_runner/test_runner.gyp b/components/test_runner/test_runner.gyp index 1d1ffec..ee4829e 100644 --- a/components/test_runner/test_runner.gyp +++ b/components/test_runner/test_runner.gyp @@ -124,11 +124,6 @@ }, }, 'conditions': [ - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '../../base/allocator/allocator.gyp:allocator', - ], - }], ['OS=="win"', { 'configurations': { 'Debug_Base': { diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn index 697293c..c65a9be5 100644 --- a/content/app/BUILD.gn +++ b/content/app/BUILD.gn @@ -25,11 +25,6 @@ content_app_sources = [ content_app_deps = [ "//base", "//base:i18n", - - # This is needed by app/content_main_runner.cc - # TODO(brettw) this shouldn't be here, only final executables should be - # picking the allocator. http://crbug.com/571731 - "//base/allocator", "//content:export", "//content:sandbox_helper_win", "//content/public/common:common_sources", diff --git a/content/content_app.gypi b/content/content_app.gypi index 4de603b..ad82f48 100644 --- a/content/content_app.gypi +++ b/content/content_app.gypi @@ -40,12 +40,6 @@ 'public/app/content_main_runner.h', ], 'conditions': [ - ['((OS=="linux" and os_posix==1 and use_aura==1) or OS=="android") and use_allocator!="none"', { - 'dependencies': [ - # This is needed by app/content_main_runner.cc - '../base/allocator/allocator.gyp:allocator', - ], - }], ['OS=="android"', { 'sources!': [ 'app/content_main.cc', diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index d7c98a2..9e37366 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -802,11 +802,6 @@ 'renderer/webscrollbarbehavior_impl_mac.mm', ], }], - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], ['OS=="android"', { 'sources': [ 'renderer/external_popup_menu.cc', diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 8d06d39..8e64c70 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -235,11 +235,6 @@ }, }, 'conditions': [ - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], ['OS=="win"', { 'resource_include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/content/app/strings', @@ -286,12 +281,6 @@ 'DEBUG_DEVTOOLS=1', ], }], - ['(OS=="linux" or OS=="android") and use_allocator!="none"', { - 'dependencies': [ - # This is needed by content/app/content_main_runner.cc - '../base/allocator/allocator.gyp:allocator', - ], - }], ['use_aura==1', { 'dependencies': [ '../ui/aura/aura.gyp:aura', @@ -492,11 +481,6 @@ '../sandbox/sandbox.gyp:sandbox', ], 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], ['win_console_app==1', { 'defines': ['WIN_CONSOLE_APP'], }, { # else win_console_app==0 diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 1829548..f8e681d 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -1227,11 +1227,6 @@ '../dbus/dbus.gyp:dbus_test_support', ], }], - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], ['OS=="win"', { 'dependencies': [ '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', @@ -1365,11 +1360,6 @@ '../testing/android/native_test.gyp:native_test_native_code', ], }], - ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], ], }, { @@ -1533,11 +1523,6 @@ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], }], - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], ['OS=="android"', { 'sources': [ '<@(content_browsertests_android_sources)' ], 'sources!': [ @@ -1637,11 +1622,6 @@ '../third_party/mesa/mesa.gyp:osmesa', ], }], - ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], ], }, { @@ -1666,13 +1646,6 @@ 'sources': [ 'common/gpu/client/gl_helper_benchmark.cc', ], - 'conditions': [ - ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], - ], }, ], }], @@ -1729,13 +1702,6 @@ '<(angle_path)/src/angle.gyp:libGLESv2', ], }], - ['(OS=="win" and win_use_allocator_shim==1) or ' - '(os_posix == 1 and OS != "android" and ' - ' use_allocator!="none")', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', { 'include_dirs': [ '<(DEPTH)/third_party/libva', diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn index b08f9dd..1877240 100644 --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn @@ -25,10 +25,6 @@ source_set("renderer") { deps = [ "//base:i18n", - - # TODO(GYP) bug 376846 remove this. This should be inherited from //net but - # those don't cross component boundaries. - "//base/allocator", "//cc", "//cc/blink", "//cc/proto", diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn index 37cf83e..078c7e2 100644 --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn @@ -195,7 +195,6 @@ static_library("content_shell_lib") { ":resources", "//base", "//base:base_static", - "//base/allocator", "//base/third_party/dynamic_annotations", "//cc", "//components/crash/content/app:app_breakpad_mac_win_to_be_deleted", @@ -420,7 +419,6 @@ if (!is_android && !is_mac) { deps = [ ":content_shell_lib", ":pak", - "//base/allocator", "//build/config/sanitizers:deps", "//build/win:default_exe_manifest", ] diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index 37dcdcc..b6f22ab 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -360,7 +360,6 @@ test("content_browsertests") { deps = [ ":browsertest_support", ":web_ui_test_mojo_bindings", - "//base/allocator", "//base/test:test_support", "//content:resources", "//content/browser/background_sync:background_sync_proto", @@ -558,7 +557,6 @@ test("content_unittests") { deps = [ ":test_support", - "//base/allocator", "//base/test:test_support", "//content/browser/background_sync:background_sync_proto", "//content/browser/cache_storage:cache_storage_proto", @@ -783,7 +781,6 @@ test("content_perftests") { "../test/run_all_perftests.cc", ] deps = [ - "//base/allocator", "//base/test:test_support", "//cc", "//content/public/browser", @@ -818,7 +815,6 @@ test("content_gl_tests") { deps = [ ":test_support", - "//base/allocator", "//base/test:test_support", "//content/public/common", "//gpu/blink", @@ -854,7 +850,6 @@ test("content_gl_benchmark") { deps = [ ":test_support", - "//base/allocator", "//base/test:test_support", "//content/public/common", "//gpu/blink", diff --git a/courgette/BUILD.gn b/courgette/BUILD.gn index f27c81e..6645093 100644 --- a/courgette/BUILD.gn +++ b/courgette/BUILD.gn @@ -129,7 +129,6 @@ test("courgette_unittests") { ":courgette_lib", "//base", "//base:i18n", - "//base/allocator", "//base/test:run_all_unittests", "//base/test:test_support", "//testing/gtest", diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp index 788d4ea..3983f19 100644 --- a/courgette/courgette.gyp +++ b/courgette/courgette.gyp @@ -131,17 +131,6 @@ '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', ], - 'conditions': [ - [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], - ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], }, diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index f8b7967..e6266ec 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -195,14 +195,6 @@ ], 'conditions': [ [ 'use_nss_certs == 1', { - 'conditions': [ - [ 'use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }, - ], - ], 'dependencies': [ '../build/linux/system.gyp:ssl', ], diff --git a/device/device_tests.gyp b/device/device_tests.gyp index e09399d..9112d40 100644 --- a/device/device_tests.gyp +++ b/device/device_tests.gyp @@ -149,15 +149,6 @@ ], }, }], - ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], ['use_udev==1', { 'dependencies': [ 'udev_linux/udev.gyp:udev_linux', diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index 3874b03..ad2ea80 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -205,10 +205,6 @@ test("extensions_unittests") { "//third_party/mesa:osmesa", ] - if (is_win) { - deps += [ "//base/allocator" ] - } - if (is_chromeos) { sources += [ "browser/api/webcam_private/visca_webcam_unittest.cc", @@ -276,8 +272,6 @@ test("extensions_browsertests") { ] if (is_win) { - deps += [ "//base/allocator" ] - if (target_cpu == "x86") { data_deps += [ # "$root_out_dir/wow_helper.exe" # TODO(GYP) @@ -309,7 +303,6 @@ source_set("chrome_extensions_browsertests") { deps = [ "//base", "//base:i18n", - "//base/allocator", "//base/test:test_support", "//chrome/browser", "//chrome/browser/resources:extension_resource_demo", @@ -376,7 +369,6 @@ source_set("chrome_extensions_interactive_uitests") { # These are the deps from interactive_uitests minus some internal Chrome # ones that aren't allowed to be included here and that aren't needed. deps = [ - "//base/allocator", "//chrome/browser", "//chrome/browser/devtools", "//chrome/renderer", diff --git a/extensions/extensions_tests.gyp b/extensions/extensions_tests.gyp index 771d231..c0f059d 100644 --- a/extensions/extensions_tests.gyp +++ b/extensions/extensions_tests.gyp @@ -54,11 +54,6 @@ # Disable c4267 warnings until we fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], 'conditions': [ - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], ['chromeos==1', { 'dependencies': [ '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support', @@ -98,11 +93,6 @@ '<@(extensions_browsertests_sources)', ], 'conditions': [ - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], ['OS=="mac"', { 'dependencies': [ 'shell/app_shell.gyp:app_shell', # Needed for App Shell.app's Helper. diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn index 8cb0dd3..fbc8b9b 100644 --- a/extensions/shell/BUILD.gn +++ b/extensions/shell/BUILD.gn @@ -132,7 +132,6 @@ if (!(is_chromeos && !use_ozone)) { if (is_win) { configs += [ "//build/config/win:windowed" ] configs -= [ "//build/config/win:console" ] - deps += [ "//base/allocator" ] } if (is_mac) { @@ -213,10 +212,6 @@ test("app_shell_unittests") { sources += nacl_sources } } - - if (is_win) { - deps += [ "//base/allocator" ] - } } process_version("version_header") { diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp index 7184266..10594be 100644 --- a/extensions/shell/app_shell.gyp +++ b/extensions/shell/app_shell.gyp @@ -133,11 +133,6 @@ '<(DEPTH)/sandbox/sandbox.gyp:sandbox', ], }], - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], ['OS=="mac"', { 'product_name': '<(app_shell_product_name)', 'dependencies!': [ @@ -223,11 +218,6 @@ '<@(app_shell_unittests_sources_chromeos)', ], }], - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], ], }, { diff --git a/gpu/gles2_conform_support/BUILD.gn b/gpu/gles2_conform_support/BUILD.gn index cf6114f..de55c13 100644 --- a/gpu/gles2_conform_support/BUILD.gn +++ b/gpu/gles2_conform_support/BUILD.gn @@ -33,7 +33,6 @@ config("gles2_conform_test_warnings") { } } -import("//build/config/allocator.gni") import("//testing/test.gni") # GYP version: gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support @@ -64,10 +63,6 @@ executable("gles2_conform_support") { "native/egl_native_x11.cc", ] } - if (use_allocator != "none") { - # See http://crbug.com/162998#c4 for why this is needed. - deps += [ "//base/allocator" ] - } } if (internal_gles2_conform_tests) { diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp index 6e63493..f585d92 100644 --- a/gpu/gles2_conform_support/gles2_conform_support.gyp +++ b/gpu/gles2_conform_support/gles2_conform_support.gyp @@ -96,18 +96,11 @@ 'type': 'executable', 'dependencies': [ 'egl_native', + '../../base/allocator/allocator.gyp:allocator', '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../../gpu/gpu.gyp:gles2_c_lib_nocheck', '../../third_party/expat/expat.gyp:expat', ], - 'conditions': [ - # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and use_allocator!="none"', { - 'dependencies': [ - '../../base/allocator/allocator.gyp:allocator', - ], - }], - ], 'defines': [ 'GLES2_CONFORM_SUPPORT_ONLY', 'GTF_GLES20', diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index d02f124..25487b0 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -278,12 +278,6 @@ '../testing/android/native_test.gyp:native_test_native_code', ], }], - # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], @@ -315,14 +309,6 @@ ], } ], - # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and use_allocator!="none"', - { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - } - ], ], }, { diff --git a/ipc/BUILD.gn b/ipc/BUILD.gn index a86eb7c..036ff19 100644 --- a/ipc/BUILD.gn +++ b/ipc/BUILD.gn @@ -189,13 +189,6 @@ test("ipc_tests") { # deps += "/testing/android/native_test.gyp:native_testNative_code" #} - # TODO(brettw) hook up tcmalloc to this target. - #if (is_posix && !is_mac && !is_android) { - # if (use_allocator!="none") { - # deps += "/base/allocator" - # } - #} - deps = [ ":ipc", ":test_support", @@ -218,12 +211,6 @@ test("ipc_perftests") { # deps += "/testing/android/native_test.gyp:native_testNative_code" #} - # TODO(brettw) hook up tcmalloc to this target. - #if (is_posix && !is_mac && !is_android) { - # if (use_allocator!="none") { - # deps += "//base/allocator" - # } - #} deps = [ ":ipc", ":test_support", diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp index ca1df21..b78bbf1 100644 --- a/ipc/ipc.gyp +++ b/ipc/ipc.gyp @@ -89,15 +89,6 @@ '../testing/android/native_test.gyp:native_test_native_code', ], }], - ['os_posix == 1 and OS != "mac" and OS != "android"', { - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }] ], }, { @@ -127,15 +118,6 @@ '../testing/android/native_test.gyp:native_test_native_code', ], }], - ['os_posix == 1 and OS != "mac" and OS != "android"', { - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }] ], }, { diff --git a/media/BUILD.gn b/media/BUILD.gn index 96ccfba..e8c0a87 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -689,7 +689,6 @@ test("media_unittests") { deps = [ ":media", ":test_support", - "//base/allocator", "//base/test:test_support", "//gpu:test_support", "//gpu/command_buffer/common", diff --git a/media/cast/cast_testing_tools.gypi b/media/cast/cast_testing_tools.gypi index 0532b9d..b317761 100644 --- a/media/cast/cast_testing_tools.gypi +++ b/media/cast/cast_testing_tools.gypi @@ -37,15 +37,6 @@ 'sources': [ 'test/cast_benchmarks.cc', ], # source - 'conditions': [ - ['os_posix==1 and OS!="mac" and OS!="ios" and use_allocator!="none"', - { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - } - ], - ], }, { # GN version: //media/cast:cast_receiver_app diff --git a/media/media.gyp b/media/media.gyp index 6c1b76e..9e9895b 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -1388,16 +1388,6 @@ 'filters/ffmpeg_demuxer_unittest.cc', ], }], - - ['(os_posix==1 and OS!="mac") or (OS=="win" and component!="shared_library" and win_use_allocator_shim==1)', { - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], ['OS=="android"', { 'dependencies': [ '../testing/android/native_test.gyp:native_test_native_code', @@ -2032,17 +2022,6 @@ 'ffmpeg/ffmpeg_regression_tests.cc', 'test/pipeline_integration_test_base.cc', ], - 'conditions': [ - ['os_posix==1 and OS!="mac"', { - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], - ], }, ], }], diff --git a/net/BUILD.gn b/net/BUILD.gn index 71698c6..5653169 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -1403,7 +1403,6 @@ test("net_unittests") { "//base", "//base:i18n", "//base:prefs_test_support", - "//base/allocator", "//base/third_party/dynamic_annotations", "//crypto", "//crypto:platform", diff --git a/net/net.gyp b/net/net.gyp index 7d3e835..16c2f7b 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -222,15 +222,6 @@ }], ], }], - [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], [ 'use_kerberos==1', { 'defines': [ 'USE_KERBEROS', @@ -648,15 +639,6 @@ }], ], }], - ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], ['OS == "android"', { 'dependencies': [ 'net_test_jni_headers', diff --git a/ppapi/BUILD.gn b/ppapi/BUILD.gn index 8ad22ab..ae6772f 100644 --- a/ppapi/BUILD.gn +++ b/ppapi/BUILD.gn @@ -119,7 +119,6 @@ test("ppapi_unittests") { ] deps = [ - "//base/allocator", "//base/test:run_all_unittests", "//base/test:test_support", "//gpu/ipc", @@ -144,7 +143,6 @@ test("ppapi_perftests") { ] deps = [ - "//base/allocator", "//base/test:test_support", "//ppapi/proxy", "//ppapi/proxy:test_support", diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi index a6f90c9..b6b9fb6 100644 --- a/ppapi/ppapi_tests.gypi +++ b/ppapi/ppapi_tests.gypi @@ -164,14 +164,6 @@ 'proxy/ppapi_perftests.cc', 'proxy/ppp_messaging_proxy_perftest.cc', ], - 'conditions': [ - # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], }, { # GN version: //ppapi:ppapi_unittests @@ -230,17 +222,6 @@ 'shared_impl/time_conversion_unittest.cc', 'shared_impl/var_tracker_unittest.cc', ], - 'conditions': [ - [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { - 'conditions': [ - [ 'use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], - ], }, { 'target_name': 'ppapi_example_skeleton', diff --git a/printing/BUILD.gn b/printing/BUILD.gn index 45dfcc8..7690e50 100644 --- a/printing/BUILD.gn +++ b/printing/BUILD.gn @@ -223,7 +223,6 @@ test("printing_unittests") { deps = [ ":printing", - "//base/allocator", "//base/test:run_all_unittests", "//base/test:test_support", "//testing/gtest", diff --git a/printing/printing.gyp b/printing/printing.gyp index d1ca4b9..6e5c06d 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -248,15 +248,6 @@ 'backend/cups_helper_unittest.cc', ], }], - [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn index d75e99e..0667d03 100644 --- a/remoting/BUILD.gn +++ b/remoting/BUILD.gn @@ -129,7 +129,6 @@ if (!is_mac) { deps = [ ":test_support", - "//base/allocator", "//google_apis", "//remoting/base:unit_tests", "//remoting/client:unit_tests", diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn index 1f1e96c..22973b2 100644 --- a/remoting/host/BUILD.gn +++ b/remoting/host/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/config/allocator.gni") import("//build/config/features.gni") import("//build/config/ui.gni") import("//build/util/version.gni") @@ -545,9 +544,7 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host. "$remoting_version_patch" + "." + "$chrome_version_build" + "." + "$chrome_version_patch" ] - if (is_linux && use_allocator != "none") { - deps += [ "//base/allocator" ] - } else if (is_mac || is_win) { + if (is_mac || is_win) { assert(false, "not implemented on mac or win yet") } } diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi index 4ec28b1..fa39c46 100644 --- a/remoting/remoting_host.gypi +++ b/remoting/remoting_host.gypi @@ -331,13 +331,6 @@ 'host/setup/host_starter.h', 'host/setup/start_host.cc', ], - 'conditions': [ - ['OS=="linux" and use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], }, # end of target 'remoting_start_host' { # GN: //remoting/host:remoting_infoplist_strings @@ -545,11 +538,6 @@ }], # mac_breakpad==1 ], # conditions }], # OS=mac - ['OS=="linux" and use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], # OS=linux ], # end of 'conditions' }, # end of target 'remoting_me2me_host' { @@ -575,11 +563,6 @@ 'host/setup/me2me_native_messaging_host_main.h', ], 'conditions': [ - ['OS=="linux" and use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], ['OS=="mac"', { 'mac_bundle': 1, 'variables': { @@ -675,11 +658,6 @@ '../build/linux/system.gyp:gtk2', ], }], - ['OS=="linux" and use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], ['OS=="mac"', { 'mac_bundle': 1, 'variables': { diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi index 56efae3..553672b 100644 --- a/remoting/remoting_test.gypi +++ b/remoting/remoting_test.gypi @@ -406,11 +406,6 @@ ['exclude', '^host/'], ] }], - [ 'OS == "linux" and use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], ['configuration_policy == 1', { 'dependencies': [ '../components/components.gyp:policy', @@ -576,11 +571,6 @@ '../testing/android/native_test.gyp:native_test_native_code', ], }], - [ 'OS == "linux" and use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], ], # end of 'conditions' }, # end of target 'remoting_perftests' ] diff --git a/sql/BUILD.gn b/sql/BUILD.gn index b79eca8..18365e9 100644 --- a/sql/BUILD.gn +++ b/sql/BUILD.gn @@ -107,7 +107,6 @@ test("sql_unittests") { ":redirection_header", ":sql", ":test_support", - "//base/allocator", "//base/test:test_support", "//testing/gtest", "//third_party/sqlite", diff --git a/sql/sql.gyp b/sql/sql.gyp index 2e02427..30bd76d 100644 --- a/sql/sql.gyp +++ b/sql/sql.gyp @@ -109,15 +109,6 @@ '..', ], 'conditions': [ - ['os_posix==1 and OS!="mac" and OS!="ios"', { - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], ['OS == "android"', { 'dependencies': [ '../testing/android/native_test.gyp:native_test_native_code', diff --git a/sync/BUILD.gn b/sync/BUILD.gn index 04065d6..e7e3dac 100644 --- a/sync/BUILD.gn +++ b/sync/BUILD.gn @@ -724,7 +724,6 @@ test("sync_unit_tests") { ":test_support_sync_core", ":test_support_sync_internal_api", "//base", - "//base/allocator", "//base/test:run_all_unittests", "//google_apis", "//google_apis:test_support", diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi index c9ec6ed..1c0b7ac 100644 --- a/sync/sync_tests.gypi +++ b/sync/sync_tests.gypi @@ -354,14 +354,6 @@ 'util/protobuf_unittest.cc', ], 'conditions': [ - # TODO(akalin): This is needed because histogram.cc uses - # leak_annotations.h, which pulls this in. Make 'base' - # propagate this dependency. - ['OS=="linux" and use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], ['OS == "android"', { 'dependencies': [ '../testing/android/native_test.gyp:native_test_native_code', diff --git a/third_party/WebKit/Source/platform/BUILD.gn b/third_party/WebKit/Source/platform/BUILD.gn index 023849d..b2b216d 100644 --- a/third_party/WebKit/Source/platform/BUILD.gn +++ b/third_party/WebKit/Source/platform/BUILD.gn @@ -351,7 +351,6 @@ test("blink_heap_unittests") { deps = [ ":platform", "//base", - "//base/allocator", "//base/test:test_support", "//content/test:test_support", "//testing/gmock", @@ -407,7 +406,6 @@ test("blink_platform_unittests") { ":platform", ":test_support", "//base", - "//base/allocator", "//base/test:test_support", "//cc", "//cc:test_support", diff --git a/third_party/WebKit/Source/platform/blink_platform_tests.gyp b/third_party/WebKit/Source/platform/blink_platform_tests.gyp index 9bb1a84..11e30db 100644 --- a/third_party/WebKit/Source/platform/blink_platform_tests.gyp +++ b/third_party/WebKit/Source/platform/blink_platform_tests.gyp @@ -53,17 +53,6 @@ '<@(platform_heap_test_files)', ], 'conditions': [ - ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and use_allocator!="none"', { - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ] - }], - ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ] - }], ['OS=="android"', { 'type': 'shared_library', 'dependencies': [ @@ -104,12 +93,6 @@ '<@(platform_test_files)', ], 'conditions': [ - ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and use_allocator!="none"', { - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ] - }], ['OS=="android" and gtest_target_type == "shared_library"', { 'type': 'shared_library', 'dependencies': [ diff --git a/third_party/WebKit/Source/web/web_tests.gyp b/third_party/WebKit/Source/web/web_tests.gyp index 7a4699e..7943748 100644 --- a/third_party/WebKit/Source/web/web_tests.gyp +++ b/third_party/WebKit/Source/web/web_tests.gyp @@ -99,13 +99,6 @@ }, }, }, - 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], - ], }], ['OS=="android"', { 'type': 'shared_library', @@ -119,11 +112,6 @@ '../../public/web/mac', ], }], - [ 'os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and use_allocator!="none"', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], ], } ], # targets diff --git a/third_party/WebKit/Source/wtf/BUILD.gn b/third_party/WebKit/Source/wtf/BUILD.gn index 5db6483..09d9eff 100644 --- a/third_party/WebKit/Source/wtf/BUILD.gn +++ b/third_party/WebKit/Source/wtf/BUILD.gn @@ -125,7 +125,6 @@ test("wtf_unittests") { ":test_support", ":wtf", "//base", - "//base/allocator", "//base/test:test_support", "//testing/gmock", "//testing/gtest", diff --git a/third_party/WebKit/Source/wtf/wtf_tests.gyp b/third_party/WebKit/Source/wtf/wtf_tests.gyp index 3d4a703..3893882 100644 --- a/third_party/WebKit/Source/wtf/wtf_tests.gyp +++ b/third_party/WebKit/Source/wtf/wtf_tests.gyp @@ -47,12 +47,6 @@ # Disable c4267 warnings until we fix size_t to int truncations. 'msvs_disabled_warnings': [4127, 4510, 4512, 4610, 4706, 4068, 4267], 'conditions': [ - ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and use_allocator!="none"', { - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], ['OS=="android"', { 'type': 'shared_library', 'dependencies': [ diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp index 5bbfc77..e8d4211 100644 --- a/ui/app_list/app_list.gyp +++ b/ui/app_list/app_list.gyp @@ -317,17 +317,6 @@ ['exclude', 'cocoa/'], ], }], - # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and use_allocator!="none"', { - 'dependencies': [ - '../../base/allocator/allocator.gyp:allocator', - ], - }], - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '../../base/allocator/allocator.gyp:allocator', - ], - }], ], # Disable c4267 warnings until we fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], @@ -370,11 +359,6 @@ '../../content/content.gyp:sandbox_helper_win', ], }], - ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], ], }, ], diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn index dfe5349..6276a46 100644 --- a/ui/aura/BUILD.gn +++ b/ui/aura/BUILD.gn @@ -301,7 +301,6 @@ test("aura_unittests") { deps = [ ":test_support", - "//base/allocator", "//base/test:test_support", "//skia", "//testing/gtest", diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index e338d3a..20aeced 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -312,12 +312,6 @@ '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', ], }], - ['OS=="linux" and use_allocator!="none"', { - 'dependencies': [ - # See http://crbug.com/162998#c4 for why this is needed. - '../../base/allocator/allocator.gyp:allocator', - ], - }], ], }, ], diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn index 282082a..ace7a50 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -766,7 +766,6 @@ test("ui_base_unittests") { deps = [ "//base", - "//base/allocator", "//base/test:test_support", "//net", "//skia", diff --git a/ui/base/ui_base_tests.gyp b/ui/base/ui_base_tests.gyp index 123cac2..cac0238 100644 --- a/ui/base/ui_base_tests.gyp +++ b/ui/base/ui_base_tests.gyp @@ -165,13 +165,6 @@ 'dependencies': [ '../../build/linux/system.gyp:pangocairo', ], - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '../../base/allocator/allocator.gyp:allocator', - ], - }], - ], }], ['use_x11==1', { 'dependencies': [ diff --git a/ui/compositor/BUILD.gn b/ui/compositor/BUILD.gn index 293a0c9..c2c3c22 100644 --- a/ui/compositor/BUILD.gn +++ b/ui/compositor/BUILD.gn @@ -190,7 +190,6 @@ test("compositor_unittests") { ":compositor", ":test_support", "//base", - "//base/allocator", "//base/test:test_support", "//cc", "//cc:test_support", diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp index 0e65659..90c019b 100644 --- a/ui/compositor/compositor.gyp +++ b/ui/compositor/compositor.gyp @@ -192,15 +192,6 @@ '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', ], }], - ['os_posix == 1 and OS != "mac"', { - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], ['OS == "android"', { 'dependencies': [ '../../testing/android/native_test.gyp:native_test_native_code', diff --git a/ui/events/events_unittests.gyp b/ui/events/events_unittests.gyp index 3c6759a..3380c45 100644 --- a/ui/events/events_unittests.gyp +++ b/ui/events/events_unittests.gyp @@ -102,11 +102,6 @@ 'gestures/motion_event_aura_unittest.cc', ], }], - ['OS=="linux" and use_allocator!="none"', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], # Exclude tests that rely on event_utils.h for platforms that do not # provide native cracking, i.e., platforms that use events_stub.cc. ['OS!="win" and use_x11!=1 and use_ozone!=1', { diff --git a/ui/keyboard/BUILD.gn b/ui/keyboard/BUILD.gn index 61eb951..3bad9bf 100644 --- a/ui/keyboard/BUILD.gn +++ b/ui/keyboard/BUILD.gn @@ -136,7 +136,6 @@ test("keyboard_unittests") { deps = [ ":keyboard", "//base", - "//base/allocator", "//base/test:test_support", "//skia", "//testing/gtest", diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp index 96fc1fd..38d12a0 100644 --- a/ui/keyboard/keyboard.gyp +++ b/ui/keyboard/keyboard.gyp @@ -149,21 +149,6 @@ 'keyboard_util_unittest.cc', 'test/run_all_unittests.cc', ], - 'conditions': [ - ['OS=="linux" and use_allocator!="none"', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - 'link_settings': { - 'ldflags': ['-rdynamic'], - }, - }], - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], - ], }, ], } diff --git a/ui/message_center/BUILD.gn b/ui/message_center/BUILD.gn index bda992c..2a9fcfd 100644 --- a/ui/message_center/BUILD.gn +++ b/ui/message_center/BUILD.gn @@ -190,7 +190,6 @@ test("message_center_unittests") { ":message_center", ":test_support", "//base", - "//base/allocator", "//base/test:test_support", "//skia", "//testing/gtest", diff --git a/ui/message_center/message_center.gyp b/ui/message_center/message_center.gyp index 90f6838..536a4c2 100644 --- a/ui/message_center/message_center.gyp +++ b/ui/message_center/message_center.gyp @@ -239,12 +239,6 @@ ['include', '^test/run_all_unittests\\.cc$'], ], }], - # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and use_allocator!="none"', { - 'dependencies': [ - '../../base/allocator/allocator.gyp:allocator', - ], - }], ], }, # target_name: message_center_unittests ], diff --git a/ui/snapshot/BUILD.gn b/ui/snapshot/BUILD.gn index c79a70b..dda02bc 100644 --- a/ui/snapshot/BUILD.gn +++ b/ui/snapshot/BUILD.gn @@ -70,7 +70,6 @@ test("snapshot_unittests") { deps = [ ":snapshot", "//base", - "//base/allocator", "//base/test:test_support", "//skia", "//testing/gtest", diff --git a/ui/snapshot/snapshot.gyp b/ui/snapshot/snapshot.gyp index ab78afe..340668c 100644 --- a/ui/snapshot/snapshot.gyp +++ b/ui/snapshot/snapshot.gyp @@ -90,12 +90,6 @@ '../wm/wm.gyp:wm', ], }], - # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and use_allocator!="none"', { - 'dependencies': [ - '../../base/allocator/allocator.gyp:allocator', - ], - }], ], }, ], diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn index ac5bbf6..8741bec 100644 --- a/ui/views/BUILD.gn +++ b/ui/views/BUILD.gn @@ -209,7 +209,6 @@ test("views_unittests") { ":test_support", "//base", "//base:i18n", - "//base/allocator", "//base/test:test_support", "//cc", "//skia", diff --git a/ui/views/examples/examples.gyp b/ui/views/examples/examples.gyp index 1c1c3dd..c01bac2 100644 --- a/ui/views/examples/examples.gyp +++ b/ui/views/examples/examples.gyp @@ -193,11 +193,6 @@ '../../../content/content.gyp:sandbox_helper_win', ], }], - ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], ], }, # target_name: views_examples_with_content_exe ], diff --git a/ui/views/mus/BUILD.gn b/ui/views/mus/BUILD.gn index c957e9b..81ef31f 100644 --- a/ui/views/mus/BUILD.gn +++ b/ui/views/mus/BUILD.gn @@ -153,7 +153,6 @@ mojo_native_application("views_apptests") { ":mus", "//base", "//base:i18n", - "//base/allocator", "//base/test:test_support", "//cc", "//mojo/shell/public/cpp:test_support", diff --git a/ui/views/views.gyp b/ui/views/views.gyp index 885c88c..1c4963c 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -884,17 +884,6 @@ }, }, }], - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '../../base/allocator/allocator.gyp:allocator', - ], - }], - ['OS=="linux" and use_allocator!="none"', { - # See http://crbug.com/162998#c4 for why this is needed. - 'dependencies': [ - '../../base/allocator/allocator.gyp:allocator', - ], - }], ['use_x11==1', { 'dependencies': [ '../../build/linux/system.gyp:x11', diff --git a/url/BUILD.gn b/url/BUILD.gn index 5c5b3ba..d403efb 100644 --- a/url/BUILD.gn +++ b/url/BUILD.gn @@ -139,12 +139,6 @@ if (!is_android) { # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] - #if (is_posix && !is_mac && !is_ios) { - # if (use_allocator!="none") { - # deps += "//base/allocator" - # } - #} - deps = [ ":url", "//base", diff --git a/url/url.gyp b/url/url.gyp index a9990a6..e9e7ff5 100644 --- a/url/url.gyp +++ b/url/url.gyp @@ -55,15 +55,6 @@ 'url_test_utils.h', 'url_util_unittest.cc', ], - 'conditions': [ - ['os_posix==1 and OS!="mac" and OS!="ios" and use_allocator!="none"', - { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - } - ], - ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], }, |