Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2016 Google Inc. | 1 # Copyright 2016 Google Inc. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 # The Adobe DNG SDK, an API for reading and writing DNG files. | 5 # The Adobe DNG SDK, an API for reading and writing DNG files. |
| 6 { | 6 { |
| 7 'targets': [{ | 7 'targets': [{ |
| 8 'target_name': 'dng_sdk-selector', | 8 'target_name': 'dng_sdk-selector', |
| 9 'type': 'none', | 9 'type': 'none', |
| 10 'conditions': [ | 10 'conditions': [ |
| 11 [ 'skia_android_framework', { | 11 ['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 :)
| |
| 12 'dependencies': [ 'android_deps.gyp:libdng_sdk' ], | 12 'dependencies': [ 'android_deps.gyp:libdng_sdk' ], |
| 13 'export_dependent_settings': [ 'android_deps.gyp:libdng_sdk' ], | 13 'export_dependent_settings': [ 'android_deps.gyp:libdng_sdk' ], |
| 14 }, { | 14 }, { |
| 15 'dependencies': [ 'dng_sdk.gyp:dng_sdk' ], | 15 'dependencies': [ 'dng_sdk.gyp:dng_sdk' ], |
| 16 'export_dependent_settings': [ 'dng_sdk.gyp:dng_sdk' ], | 16 'export_dependent_settings': [ 'dng_sdk.gyp:dng_sdk' ], |
| 17 }] | 17 }] |
| 18 ] | 18 ] |
| 19 },{ | 19 },{ |
| 20 'target_name': 'dng_sdk', | 20 'target_name': 'dng_sdk', |
| 21 'type': 'static_library', | 21 'type': 'static_library', |
| 22 'cflags_cc': [ '-fexceptions' ], | 22 'cflags_cc': [ '-fexceptions' ], |
| 23 'cflags': [ | 23 'cflags': [ |
| 24 '-fexceptions', | 24 '-fexceptions', |
| 25 '-w', | 25 '-w', |
| 26 # FIXME: only disable ::posix_memalign() when needed. | |
| 27 '-DNO_POSIX_MEMALIGN' | |
| 28 ], | 26 ], |
| 29 'msvs_settings': { | 27 'conditions': [ |
| 30 'VCCLCompilerTool': { | 28 ['skia_os == "android"', { |
| 31 'WarningLevel': '0', | 29 '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
| |
| 32 'AdditionalOptions': ['/wd4189', ], | 30 }], |
| 33 }, | 31 ['skia_os == "win"', { |
| 34 }, | 32 'msvs_settings': { |
| 35 'xcode_settings': { | 33 'VCCLCompilerTool': { |
| 36 'WARNING_CFLAGS': ['-w'], | 34 'WarningLevel': '0', |
| 37 }, | 35 'AdditionalOptions': ['/wd4189', ], |
| 36 }, | |
| 37 }, | |
| 38 }], | |
| 39 ['skia_os == "ios" or skia_os == "mac"', { | |
| 40 'xcode_settings': { | |
| 41 'WARNING_CFLAGS': ['-w'], | |
| 42 }, | |
| 43 }], | |
| 44 ], | |
| 38 'dependencies': [ | 45 'dependencies': [ |
| 39 'dng_dont_report_errors_flags', | 46 'dng_dont_report_errors_flags', |
| 40 'dng_flags', | 47 'dng_flags', |
| 41 'dng_frame_larger_than_flags', | 48 'dng_frame_larger_than_flags', |
| 42 'dng_srcs', | 49 'dng_srcs', |
| 43 'linux_flags', | 50 'linux_flags', |
| 44 ], | 51 ], |
| 45 'direct_dependent_settings': { | 52 'direct_dependent_settings': { |
| 46 'include_dirs': [ | 53 'include_dirs': [ |
| 47 '../third_party/externals/dng_sdk/source', | 54 '../third_party/externals/dng_sdk/source', |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 274 ], | 281 ], |
| 275 }, | 282 }, |
| 276 }, { | 283 }, { |
| 277 'target_name': 'dng_frame_larger_than_flags', | 284 'target_name': 'dng_frame_larger_than_flags', |
| 278 'type': 'none', | 285 'type': 'none', |
| 279 'direct_dependent_settings': { | 286 'direct_dependent_settings': { |
| 280 'cflags': ['-Wframe-larger-than=20000'], | 287 'cflags': ['-Wframe-larger-than=20000'], |
| 281 }, | 288 }, |
| 282 }], | 289 }], |
| 283 } | 290 } |
| OLD | NEW |