Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2796)

Unified Diff: base/base.gyp

Issue 1064793002: Fix OutOfMemoryDeathTest.ViaSharedLibraries. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed CL to avoid target enumeration on unsupported OS Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/BUILD.gn ('k') | base/base_unittests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 5fafb4bfe33f02facbb678552a236f35ed7b9962..febbf3a3e96bff13016e0874ac0bc64a60e26270 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -758,11 +758,17 @@
'message_loop/message_pump_glib_unittest.cc',
]
}],
- ['OS == "linux" and use_allocator!="none"', {
- 'dependencies': [
- 'allocator/allocator.gyp:allocator',
- ],
- },
+ ['OS == "linux"', {
+ 'dependencies': [
+ 'malloc_wrapper',
+ ],
+ 'conditions': [
+ ['use_allocator!="none"', {
+ 'dependencies': [
+ 'allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ]},
],
['OS == "win"', {
'sources!': [
@@ -1327,6 +1333,20 @@
},
],
}],
+ ['OS == "linux"', {
+ 'targets': [
+ {
+ 'target_name': 'malloc_wrapper',
+ 'type': 'shared_library',
+ 'dependencies': [
+ 'base',
+ ],
+ 'sources': [
+ 'test/malloc_wrapper.cc',
+ ],
+ }
+ ],
+ }],
['OS == "android"', {
'targets': [
{
« no previous file with comments | « base/BUILD.gn ('k') | base/base_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698