From 1e3ca26f16b3124cd8ae208ceb1d47447dc46b05 Mon Sep 17 00:00:00 2001
From: Scott Graham <scottmg@chromium.org>
Date: Thu, 1 Oct 2015 11:13:50 -0700
Subject: [PATCH] win: Disable ASLR on test binary that uses fixed base

This causes a link error on msvs builds which we don't care about, but
in general if build/common.gypi forced RandomizedBaseAddress (e.g. in
Chrome), it makes sense to be explicit about disabling it for this
binary.

R=mark@chromium.org
BUG=https://groups.google.com/a/chromium.org/d/msg/crashpad-dev/jMtnDldRnJI/kNx7ZDxMAwAJ

Review URL: https://codereview.chromium.org/1376913004 .
---
 util/util_test.gyp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/util_test.gyp b/util/util_test.gyp
index 2641ff52..dc9ed60a 100644
--- a/util/util_test.gyp
+++ b/util/util_test.gyp
@@ -123,8 +123,9 @@
             'VCLinkerTool': {
               'AdditionalOptions': [
                 '/BASE:0x78000000',
-                '/FIXED',
               ],
+              'RandomizedBaseAddress': '1',  # /DYNAMICBASE:NO.
+              'FixedBaseAddress': '2',  # /FIXED.
             },
           },
         },