diff options
| author |  yujieqin <yujieqin@google.com> | 2016-02-01 02:56:40 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-01 02:56:40 -0800 |
| commit | 86e6b55b7cc652f4b94a43d62aa29c824b3af7ca (patch) | |
| tree | e0118e86ee619a0c416def946100479d24b2ae81 /gyp | |
| parent | 1b46a573656ec057eac300b34d1deff8526a559e (diff) | |
Only define NO_POSIX_MEMALIGN for arm
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1647893003
Review URL: https://codereview.chromium.org/1647893003
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/dng_sdk.gyp | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/gyp/dng_sdk.gyp b/gyp/dng_sdk.gyp index 1cc254ff11..d57c730e91 100644 --- a/gyp/dng_sdk.gyp +++ b/gyp/dng_sdk.gyp @@ -18,9 +18,6 @@ '-w', '-Wframe-larger-than=20000', '-DUNIX_ENV=1', - - # FIXME: only disable ::posix_memalign() when needed. - '-DNO_POSIX_MEMALIGN', ], 'headers': [ '../third_party/externals/dng_sdk/source/RawEnvironment.h', @@ -120,22 +117,30 @@ 'cflags_cc!': [ '-fno-rtti' ], 'cflags': [ '<@(other_cflags)' ], 'conditions': [ + ['skia_os == "android"', { + 'cflags': [ + # FIXME: only disable ::posix_memalign() when needed. + '-DNO_POSIX_MEMALIGN', + ], + }], ['skia_os == "ios" or skia_os == "mac"', { 'xcode_settings': { 'OTHER_CFLAGS': [ '<@(other_cflags)' ], 'OTHER_CPLUSPLUSFLAGS': [ '<@(other_cflags)' ], }, }], + ['skia_os == "win"', { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'WarningLevel': '0', + 'AdditionalOptions': ['/wd4189', ], + }, + }, + }], ['skia_os != "linux"', { 'sources': ['<@(headers)'], }], ], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarningLevel': '0', - 'AdditionalOptions': ['/wd4189', ], - }, - }, 'dependencies': [ 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector', 'zlib.gyp:zlib', |