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 | |
| 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
| -rw-r--r-- | common_conditions.gypi | 1 | ||||
| -rw-r--r-- | opts.gyp | 2 | ||||
| -rw-r--r-- | skia_for_chromium_defines.gypi | 5 |
3 files changed, 2 insertions, 6 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', @@ -48,7 +48,7 @@ 'opts_ssse3', ], 'sources': [ - '../src/opts/opts_check_SSE2.cpp', + '../src/opts/opts_check_x86.cpp', '../src/opts/SkBitmapProcState_opts_SSE2.cpp', '../src/opts/SkBitmapFilter_opts_SSE2.cpp', '../src/opts/SkBlitRow_opts_SSE2.cpp', diff --git a/skia_for_chromium_defines.gypi b/skia_for_chromium_defines.gypi index 1ec908e..8a6fb34 100644 --- a/skia_for_chromium_defines.gypi +++ b/skia_for_chromium_defines.gypi @@ -16,11 +16,6 @@ 'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1', 'SK_SUPPORT_LEGACY_GETTOPDEVICE', 'SK_SUPPORT_LEGACY_N32_NAME', - 'SK_SUPPORT_LEGACY_PROCXFERMODE', - 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', - 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', - 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', - 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', 'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE', ], }, |