Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(424)

Unified Diff: gyp/dng_sdk.gyp

Issue 1647893003: Only define NO_POSIX_MEMALIGN when needed (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Change the condition Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/dng_sdk.gyp
diff --git a/gyp/dng_sdk.gyp b/gyp/dng_sdk.gyp
index 455990ba3d4a3b827ca6592ea7043d7aa3f64961..c49e6c45ccd74683c6dd20c7401a8245955ae843 100644
--- a/gyp/dng_sdk.gyp
+++ b/gyp/dng_sdk.gyp
@@ -8,7 +8,7 @@
'target_name': 'dng_sdk-selector',
'type': 'none',
'conditions': [
- [ 'skia_android_framework', {
+ ['skia_android_framework', {
scroggo 2016/01/28 16:28:53 nit: This kind of change makes it harder to track
yujieqin 2016/02/01 10:48:40 reverted :)
'dependencies': [ 'android_deps.gyp:libdng_sdk' ],
'export_dependent_settings': [ 'android_deps.gyp:libdng_sdk' ],
}, {
@@ -23,18 +23,25 @@
'cflags': [
'-fexceptions',
'-w',
- # FIXME: only disable ::posix_memalign() when needed.
- '-DNO_POSIX_MEMALIGN'
],
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- 'WarningLevel': '0',
- 'AdditionalOptions': ['/wd4189', ],
- },
- },
- 'xcode_settings': {
- 'WARNING_CFLAGS': ['-w'],
- },
+ 'conditions': [
+ ['skia_os == "android"', {
+ 'cflags': ['-DNO_POSIX_MEMALIGN'],
adaubert 2016/01/28 15:57:54 Could you please keep the "fixme" in the android c
scroggo 2016/01/28 16:28:53 Any idea when/why it's needed? Is there a bug file
adaubert 2016/01/28 16:42:36 Posix_memalign allocates page-aligned, to which ex
yujieqin 2016/01/28 17:05:01 @adaubert, I am not aware of any android could wor
adaubert 2016/01/28 18:08:43 As far as I remember posix_memalign works fine e.g
yujieqin 2016/02/01 10:48:40 It seems like the posix_memalign is added to andro
+ }],
+ ['skia_os == "win"', {
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'WarningLevel': '0',
+ 'AdditionalOptions': ['/wd4189', ],
+ },
+ },
+ }],
+ ['skia_os == "ios" or skia_os == "mac"', {
+ 'xcode_settings': {
+ 'WARNING_CFLAGS': ['-w'],
+ },
+ }],
+ ],
'dependencies': [
'dng_dont_report_errors_flags',
'dng_flags',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698