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

Unified Diff: chrome/chrome_syzygy.gyp

Issue 23719017: Disable the SyzyASan instrumentation of chrome_child.dll for the official builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_syzygy.gyp
diff --git a/chrome/chrome_syzygy.gyp b/chrome/chrome_syzygy.gyp
index d4994ac1813c8432e8564dc25f185331d4a39f21..0801d18e62b43d9c9101ae5abbaa4698b74bffd6 100644
--- a/chrome/chrome_syzygy.gyp
+++ b/chrome/chrome_syzygy.gyp
@@ -19,7 +19,8 @@
],
}],
# Note, not else.
- ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1', {
+ ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1 and '
+ '(asan!=1 or buildtype!="Official")', {
'variables': {
'dll_name': 'chrome_child',
},
@@ -33,6 +34,34 @@
],
},
],
+ }, {
+ 'conditions': [
+ ['OS=="win" and fastbuild==0 and chrome_multiple_dll==1 and '
gab 2013/09/10 18:27:02 Feels like this would be cleaner if: 1) The condi
Sébastien Marchand 2013/09/10 18:58:56 Yeah, Chris is working on another CL that'll chang
+ 'asan==1 and buildtype=="Official"', {
+ 'targets': [
+ {
+ 'target_name': 'chrome_child_dll_syzygy',
+ 'type': 'none',
+ 'inputs': [
+ '<(PRODUCT_DIR)/chrome_child.dll',
+ '<(PRODUCT_DIR)/chrome_child.dll.pdb',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/syzygy/chrome_child.dll',
+ '<(PRODUCT_DIR)/syzygy/chrome_child.dll.pdb',
+ ],
+ 'copies': [
+ {
+ 'destination': '<(PRODUCT_DIR)/syzygy',
+ 'files': [
+ '<(PRODUCT_DIR)/chrome_child.dll',
+ '<(PRODUCT_DIR)/chrome_child.dll.pdb',
+ ],
gab 2013/09/10 18:27:02 Which doesn't the main chrome DLL need to do this
gab 2013/09/10 18:27:32 s/Which/Why
Sébastien Marchand 2013/09/10 18:58:56 The purpose of this CL was to be able to run an ex
+ },
+ ],
+ }],
+ }],
+ ],
}],
],
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698