diff options
| author |  mtklein <mtklein@google.com> | 2016-02-26 16:57:33 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-26 16:57:33 -0800 |
| commit | cb3d4fc7d6fa8e303983b5a0c185737a5ba6bc02 (patch) | |
| tree | de6491449d07d2a3026e82f52bdc08a17cb6f003 /gyp | |
| parent | 0fe12bcfb79de1d1066a4c3213184dbf2aac1321 (diff) | |
Revert of Enable RAW codec for Windows (patchset #8 id:140001 of https://codereview.chromium.org/1738913002/ )
Reason for revert:
I don't think there's anything wrong with this per-se, but the 32-bit Windows bots are running out of memory while running these tests now.
(You'll see something like c:\0\build\slave\workdir\build\skia\include\core\skbitmap.h:247: fatal error: ""sk_throw"" in the log.)
We run these tests in parallel, and sometimes these 32-bit processes try to use more than the 2-3G RAM they can allocate. Seems like this is a particularly memory-intense process?
If we reland this, we might want to blacklist these tests on the 32-bit Windows bots. The 64-bit bots should have access to tons and tons of RAM and let us keep testing for Windows.
Original issue's description:
> Enable RAW codec for Windows
>
> * Fix the exception catching
> * Set preprocessor differently for MSVC
>
> BUG=skia:4889(b/26958348)
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1738913002
>
> Committed: https://skia.googlesource.com/skia/+/474e4c3dd28b67f590851321f15d9983ef7fd031
TBR=scroggo@google.com,msarett@google.com,yujieqin@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4889(b/26958348)
Review URL: https://codereview.chromium.org/1747443003
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_variables.gypi | 10 | ||||
| -rw-r--r-- | gyp/dng_sdk.gyp | 11 |
2 files changed, 8 insertions, 13 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index e26939f864..0688f627b9 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -53,15 +53,19 @@ 'skia_os%': '<(skia_os)', 'vulkan_merged_into_skia': '1', 'skia_android_framework%': 0, - # RAW codec needs exceptions. Due to that, it is a separate target. Its usage can be - # controlled by skia_codec_decodes_raw. - 'skia_codec_decodes_raw%': 1, 'conditions' : [ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"]', { 'skia_arch_type%': 'x86_64', }, { 'skia_arch_type%': 'x86', }], + # RAW codec needs exceptions. Due to that, it is a separate target. Its usage can be + # controlled by skia_codec_decodes_raw. + ['skia_os == "win"', { + 'skia_codec_decodes_raw%' : 0, + }, { + 'skia_codec_decodes_raw%' : 1, + }], ], 'arm_version%': 0, 'arm_neon%': 0, diff --git a/gyp/dng_sdk.gyp b/gyp/dng_sdk.gyp index 3d426241e6..7655fd3885 100644 --- a/gyp/dng_sdk.gyp +++ b/gyp/dng_sdk.gyp @@ -127,16 +127,7 @@ 'msvs_settings': { 'VCCLCompilerTool': { 'WarningLevel': '0', - 'AdditionalOptions': [ - '/wd4189', - '/DqDNGBigEndian#0', - '/DqDNGReportErrors#0', - '/DqDNGThreadSafe#1', - '/DqDNGUseLibJPEG#1', - '/DqDNGUseXMP#0', - '/DqDNGValidate#0', - '/DqDNGValidateTarget#1', - ], + 'AdditionalOptions': ['/wd4189', ], }, }, }], |