summaryrefslogtreecommitdiffstats
path: root/net/net.gyp
diff options
context:
space:
mode:
authorjknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-13 10:10:16 +0000
committerjknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-13 10:10:16 +0000
commit614f33221537e5bcbeac8a61712a3e488cf9f2a9 (patch)
tree0c77c84558f59f34e64e2f6dde30e7afeeabceaa /net/net.gyp
parentacadac5e6788b4444c8797bb9726d824397faaa1 (diff)
downloadchromium_src-614f33221537e5bcbeac8a61712a3e488cf9f2a9.zip
chromium_src-614f33221537e5bcbeac8a61712a3e488cf9f2a9.tar.gz
chromium_src-614f33221537e5bcbeac8a61712a3e488cf9f2a9.tar.bz2
DiskCacheTest.MappedFile_SyncIO asan fix for Chrome on Android.
Build net_unittests with same defines as net. Downstream, we discovered an ASAN failure in net_unittests. The problem is that disk_cache::MappedFile has a member variable that is conditional on the POSIX_AVOID_MMAP preprocessor macro. DiskCacheTest.MappedFile_SyncIO test creates an instance of MappedFile, so it needs to have the same preprocessor macro defined as in net. BUG= TEST=DiskCacheTest.MappedFile_SyncIO Review URL: https://chromiumcodereview.appspot.com/10692096 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146546 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
-rw-r--r--net/net.gyp5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp
index 1fbe755..a3516d9 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -847,6 +847,11 @@
'defines': [
'POSIX_AVOID_MMAP',
],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'POSIX_AVOID_MMAP',
+ ],
+ },
'sources!': [
'disk_cache/mapped_file_posix.cc',
],