Commit fccd31cc authored by ssid's avatar ssid Committed by Commit bot

[clean-up] Remove allocator.gyp dependency from library targets

This CL does a refactoring of the dependencies and do not change any
behavior. The diff between the ninja files is presented in link:
http://pastebin.com/aG6eq5cb.

The test_support_gpu.gypi included allocator.gyp for no reason, and the
only other target that uses this file is content_browsertests, which
already includes allocatpor.gyp with same conditions. So, removing
this dependency here.

target:browser_ui - depends on allocator.gyp in windows
targets that depend on browser_ui:
  chrome_android_core: not used in windows

  Dependency on allocator.gyp exists already for:
  All, browser (explained below)

target:browser - depends on allocator.gyp in windows
targets that depend on browser:
  chrome_android_core: only android
  chromevox_tests: added dependency to allocator.gyp for windows

  Dependency on allocator.gyp exists already for:
    All, interactive_ui_tests, browser_tests, performance_browser_tests
    chrome_main_dll, chrome_initial, unit_tests, chrome_app_unittests

    test_support_sync_integration's executables:
      sync_integration_tests, browser_tests, sync_performance_tests

    test_support_common's executables:
      interactive_ui_tests, browser_tests, performance_browser_tests

    test_support_unit's executables:
      unit_tests

target:renderer - depends and exports dependency on allocator.gyp in
windows
targets that depend on renderer:
  chrome_android_core: not used in windows
  chromevox_tests: added dependency to allocator.gyp for windows
    chrome_child_dll - added dependency.

  Dependency on allocator.gyp exists already for:
    interactive_ui_tests, browser_tests, performance_browser_tests
    sync_integration_tests, chrome_main_dll, chrome_initial, unit_tests
    chrome_app_unittests

    test_support_common - explained earlier.

target:browser_extensions - depends on allocator.gyp in windows
targets that depend on browser_extensions:
  apps - browser (explained above)
  browser_ui (explained above)
  browser_chromeos
    browser (explained above)
    browser_tests
    apps - browser (explained above)

target:web_cache_browser - depends on allocator.gyp in windows
All the targets that depend on web_cache_browser already have
dependency on allocator.gyp:
  browser*, components_unittests

  extensions_browser
    extensions_unittests, browser_extensions*, apps*

    media_router
      browser_ui*, browser*, native_app_window - browser_ui*
      javascript_dialog_extensions_client - browser_ui*
      media_router_test_support
        browser_tests, test_support_unit*, unit_tests

    app_shell_lib
      extensions_browsertests, app_shell, app_shell_unittests

    extensions_test_support
      extensions_unittests, extensions_browsertests, app_shell_unittests
      test_support_common*

* - see previous sections for why it is fine for the target to not
depend on allocator.gyp

BUG=

Review URL: https://codereview.chromium.org/1462853002

Cr-Commit-Position: refs/heads/master@{#361381}
parent 0888cffc
...@@ -122,6 +122,11 @@ ...@@ -122,6 +122,11 @@
'<(DEPTH)/native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp:nacl_helper_bootstrap', '<(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': [ 'defines': [
'HAS_OUT_OF_PROC_TEST_RUNNER', 'HAS_OUT_OF_PROC_TEST_RUNNER',
......
...@@ -3763,11 +3763,6 @@ ...@@ -3763,11 +3763,6 @@
'kasko_dll', 'kasko_dll',
], ],
}], }],
['win_use_allocator_shim==1', {
'dependencies': [
'<(allocator_target)',
],
}],
['branding!="Chrome"', { ['branding!="Chrome"', {
'dependencies!': [ 'dependencies!': [
'../google_update/google_update.gyp:google_update', '../google_update/google_update.gyp:google_update',
......
...@@ -1097,13 +1097,6 @@ ...@@ -1097,13 +1097,6 @@
'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
'../third_party/isimpledom/isimpledom.gyp:isimpledom', '../third_party/isimpledom/isimpledom.gyp:isimpledom',
], ],
'conditions': [
['win_use_allocator_shim==1', {
'dependencies': [
'<(allocator_target)',
],
}],
],
}, { # 'OS!="win" }, { # 'OS!="win"
'conditions': [ 'conditions': [
['OS=="linux" and toolkit_views==1',{ ['OS=="linux" and toolkit_views==1',{
......
...@@ -3136,11 +3136,6 @@ ...@@ -3136,11 +3136,6 @@
'browser/ui/views/frame/taskbar_decorator.cc' 'browser/ui/views/frame/taskbar_decorator.cc'
], ],
'conditions': [ 'conditions': [
['win_use_allocator_shim==1', {
'dependencies': [
'<(allocator_target)',
],
}],
['branding!="Chrome"', { ['branding!="Chrome"', {
'dependencies!': [ 'dependencies!': [
'../google_update/google_update.gyp:google_update', '../google_update/google_update.gyp:google_update',
......
...@@ -366,6 +366,11 @@ ...@@ -366,6 +366,11 @@
'app/close_handle_hook_win.h', 'app/close_handle_hook_win.h',
], ],
'conditions': [ 'conditions': [
['OS=="win" and win_use_allocator_shim==1', {
'dependencies': [
'<(allocator_target)',
],
}],
['OS=="win"', { ['OS=="win"', {
'conditions': [ 'conditions': [
['chrome_pgo_phase==1', { ['chrome_pgo_phase==1', {
......
...@@ -391,16 +391,6 @@ ...@@ -391,16 +391,6 @@
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/third_party/wtl/include', '<(DEPTH)/third_party/wtl/include',
], ],
'conditions': [
['win_use_allocator_shim==1', {
'dependencies': [
'<(allocator_target)',
],
'export_dependent_settings': [
'<(allocator_target)',
],
}],
],
}], }],
], ],
}, },
......
...@@ -31,13 +31,6 @@ ...@@ -31,13 +31,6 @@
], ],
# Disable c4267 warnings until we fix size_t to int truncations. # Disable c4267 warnings until we fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ], 'msvs_disabled_warnings': [ 4267, ],
'conditions': [
['OS=="win" and win_use_allocator_shim==1', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
}],
],
}, },
{ {
'target_name': 'web_cache_renderer', 'target_name': 'web_cache_renderer',
......
...@@ -25,13 +25,6 @@ ...@@ -25,13 +25,6 @@
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/third_party/wtl/include', '<(DEPTH)/third_party/wtl/include',
], ],
'conditions': [
['win_use_allocator_shim==1', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
}],
],
'configurations': { 'configurations': {
'Debug': { 'Debug': {
'msvs_settings': { 'msvs_settings': {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment