summaryrefslogtreecommitdiffstats
path: root/courgette
diff options
context:
space:
mode:
authorprimiano <primiano@chromium.org>2016-01-28 13:10:55 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-28 21:11:58 +0000
commit115ceedf72a6b2be9a7b3d60f7cd36afa0192dde (patch)
treebc12edad22f4ff9619783e49a45286177e3c8f76 /courgette
parent3c35b7b4fa9651930b4b9b7d4c8a9de4712f6218 (diff)
downloadchromium_src-115ceedf72a6b2be9a7b3d60f7cd36afa0192dde.zip
chromium_src-115ceedf72a6b2be9a7b3d60f7cd36afa0192dde.tar.gz
chromium_src-115ceedf72a6b2be9a7b3d60f7cd36afa0192dde.tar.bz2
allocator cleanup: remove dependencies on allocator from all targets
Overview of the cleanup: ------------------------ - In the context of the discussion in https://goo.gl/K2m649 our illustrious base/ owners suggested that having base being the only target depending on allocator (and having the other targets inherit that recursively) would be a more scalable solution, as opposite to having to remember to add an exec -> allocator to each target. - This base -> allocator dep landed in crrev.com/1616793003. - After that CL, until this point, many targets got two paths that lead to allocator: 1. The indirect one via base (content_shell -> base -> allocator) which is what we want to preserve. 2. The direct one (content_shell -> allocator) which is the inconsistent one we want to drop. This CL gets rid of all the instances of 2. The nice property of this sequencing of CLs is that the effect of this large change on the final .ninja files is minimal. See details below. Effect on the produced ninja files: ----------------------------------- GYP, Linux, static build: https://paste.ee/p/RaJLj Just some small reordering of include paths. Dropping --rdynamic (as expected) in keyboard_unittests GN, Linux, static build: https://paste.ee/p/zYtrQ Various targets lose the dependency on allocator.stamp (expected, the order is enforced by depending on base which depends on allocator.stamp) GN, Android (both component and static are similar): https://paste.ee/p/Iq6DD As above. GN, Linux, component build: https://paste.ee/p/jHUmv This is the most juicy change. As expected all the ODR goes away and random targets stop re-linking tcmalloc .o files. GYP, Win, static: https://paste.ee/p/j0IjL Extremely minimal changes: All.ninja stops depending on libcmt.lib. Sounds fine as base (which depends on that) is definitely depending on libcmt. GN, Win, static: https://paste.ee/p/Q6zTo Minimal change, like Linux GN, dropping dependencies on the .stamp files. BUG=564618 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1647453002 Cr-Commit-Position: refs/heads/master@{#372167}
Diffstat (limited to 'courgette')
-rw-r--r--courgette/BUILD.gn1
-rw-r--r--courgette/courgette.gyp11
2 files changed, 0 insertions, 12 deletions
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, ],
},