diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-05-01 18:37:47 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-05-01 18:37:47 +0000 |
| commit | 6e07e1e3067db119e10557e50c1c5063a61ab1a7 (patch) | |
| tree | 77082cd3762bbe0f80db470f6667f130ba2af790 /common_conditions.gypi | |
| parent | 6c21bc5e5fdb911278a7270f8b2070efcdb513e9 (diff) | |
| parent | 0eeb9c68a7d8629935845dd62b56103533f98ee7 (diff) | |
| download | gyp-6e07e1e3067db119e10557e50c1c5063a61ab1a7.tar.gz | |
Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at 0eeb9c68a7d8629935845dd62b56103533f98ee7
This commit was generated by merge_from_chromium.py.
Change-Id: I9cce7aee6706b6f7a4c1ac00dfb35a645de4efd5
Diffstat (limited to 'common_conditions.gypi')
| -rw-r--r-- | common_conditions.gypi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/common_conditions.gypi b/common_conditions.gypi index 77dd925..e89d116 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -31,6 +31,7 @@ 'AdditionalOptions': [ '/MP', ], }, 'VCLinkerTool': { + 'LargeAddressAware': 2, # 2 means "Yes, please let me use more RAM on 32-bit builds." 'AdditionalDependencies': [ 'OpenGL32.lib', 'usp10.lib', |