summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/safe_browsing
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-06-18 14:10:49 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-06-18 13:53:24 +0000
commit813fbf95af77a531c57a8c497345ad2c61d475b3 (patch)
tree821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/chrome/browser/safe_browsing
parentaf6588f8d723931a298c995fa97259bb7f7deb55 (diff)
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/chrome/browser/safe_browsing')
-rw-r--r--chromium/chrome/browser/safe_browsing/incident_reporting/verifier_test/verifier_unittest.gyp (renamed from chromium/chrome/browser/safe_browsing/verifier_test/verifier_unittest.gyp)6
1 files changed, 6 insertions, 0 deletions
diff --git a/chromium/chrome/browser/safe_browsing/verifier_test/verifier_unittest.gyp b/chromium/chrome/browser/safe_browsing/incident_reporting/verifier_test/verifier_unittest.gyp
index 55ae89170a6..bf93f8e96bd 100644
--- a/chromium/chrome/browser/safe_browsing/verifier_test/verifier_unittest.gyp
+++ b/chromium/chrome/browser/safe_browsing/incident_reporting/verifier_test/verifier_unittest.gyp
@@ -1,4 +1,10 @@
{
+ 'variables': {
+ # Unconditionally disable incremental linking for these modules so that
+ # their exports do not go through an ILT jmp stub.
+ 'incremental_chrome_dll': '0', # 0 means no
+ 'msvs_debug_link_incremental': '1', # 1 means /INCREMENTAL:NO
+ },
'targets': [
{
'target_name': 'verifier_test_dll_1',