Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # conditions used in both common.gypi and skia.gyp in chromium | 1 # conditions used in both common.gypi and skia.gyp in chromium |
| 2 # | 2 # |
| 3 { | 3 { |
| 4 'defines': [ | 4 'defines': [ |
| 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', | 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', |
| 6 'SK_SUPPORT_GPU=<(skia_gpu)', | 6 'SK_SUPPORT_GPU=<(skia_gpu)', |
| 7 'SK_SUPPORT_OPENCL=<(skia_opencl)', | 7 'SK_SUPPORT_OPENCL=<(skia_opencl)', |
| 8 'SK_DISTANCEFIELD_FONTS=<(skia_distancefield_fonts)', | 8 'SK_DISTANCEFIELD_FONTS=<(skia_distancefield_fonts)', |
| 9 ], | 9 ], |
| 10 'conditions' : [ | 10 'conditions' : [ |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 186 'cflags': [ | 186 'cflags': [ |
| 187 '-mfloat-abi=softfp', | 187 '-mfloat-abi=softfp', |
| 188 ], | 188 ], |
| 189 }], | 189 }], |
| 190 ], | 190 ], |
| 191 }], | 191 }], |
| 192 ], | 192 ], |
| 193 }, | 193 }, |
| 194 ], | 194 ], |
| 195 | 195 |
| 196 ['skia_android_framework', { | |
| 197 'cflags': [ | |
| 198 # Skia does not enforce this usage pattern so we disable it here to avoi d | |
| 199 # unecessary log spew when building | |
| 200 '-Wno-unused-parameter', | |
| 201 | |
| 202 # Android's -D_FORTIFY_SOURCE=2 extensions are incompatibile with SkStri ng. | |
| 203 # Revert to -D_FORTIFY_SOURCE=1 | |
| 204 '-U_FORTIFY_SOURCE', | |
| 205 '-D_FORTIFY_SOURCE=1', | |
| 206 ], | |
| 207 'cflags!': [ | |
|
djsollen
2014/01/22 21:02:44
If these are in our gyp files then I would prefer
scroggo
2014/01/22 23:52:41
Done.
| |
| 208 '-fstrict-aliasing', | |
| 209 '-Wall', | |
| 210 '-Wno-c++11-extensions', | |
| 211 '-fuse-ld=gold', | |
| 212 '-fno-exceptions', | |
| 213 '-fomit-frame-pointer', | |
| 214 '-mno-apcs-frame', | |
| 215 '-g', | |
| 216 '-mthumb', | |
| 217 '-march=armv7-a', | |
| 218 '-mfpu=neon', | |
| 219 '-mfloat-abi=softfp', | |
| 220 '-msse2', | |
| 221 # FIXME: Will this be needed for building SkBitmapProcState_opts_SSSE3.c pp? | |
| 222 #'-mssse3', | |
| 223 ], | |
| 224 'cflags_cc!': [ | |
| 225 '-fno-rtti', | |
| 226 ], | |
| 227 'defines': [ | |
| 228 'DCT_IFAST_SUPPORTED', | |
| 229 # using freetype's embolden allows us to adjust fake bold settings at | |
| 230 # draw-time, at which point we know which SkTypeface is being drawn | |
| 231 'SK_USE_FREETYPE_EMBOLDEN', | |
| 232 # Android provides at least FreeType 2.4.0 at runtime. | |
| 233 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', | |
| 234 # Skia should not use dlopen on Android. | |
| 235 'SK_CAN_USE_DLOPEN=0', | |
| 236 ], | |
| 237 'defines!': [ | |
| 238 # Don't hardcode these into the Android.mk | |
| 239 'SK_DEBUG', | |
| 240 'SK_DEVELOPER=1', | |
| 241 ], | |
| 242 'libraries!': [ | |
|
djsollen
2014/01/22 21:02:44
same here
scroggo
2014/01/22 23:52:41
Done.
| |
| 243 '-lstdc++', | |
| 244 '-lm', | |
| 245 ], | |
| 246 'include_dirs!': [ | |
|
djsollen
2014/01/22 21:02:44
and here
scroggo
2014/01/22 23:52:41
I think these are actually unneeded in general, so
| |
| 247 'config', | |
| 248 'ext', | |
| 249 ], | |
| 250 }], | |
| 196 | 251 |
| 197 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ', | 252 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ', |
| 198 { | 253 { |
| 199 'defines': [ | 254 'defines': [ |
| 200 'SK_SAMPLES_FOR_X', | 255 'SK_SAMPLES_FOR_X', |
| 201 'SK_BUILD_FOR_UNIX', | 256 'SK_BUILD_FOR_UNIX', |
| 202 ], | 257 ], |
| 203 'configurations': { | 258 'configurations': { |
| 204 'Coverage': { | 259 'Coverage': { |
| 205 'cflags': ['--coverage'], | 260 'cflags': ['--coverage'], |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 468 'defines': [ | 523 'defines': [ |
| 469 'SK_USE_POSIX_THREADS', | 524 'SK_USE_POSIX_THREADS', |
| 470 ], | 525 ], |
| 471 }], | 526 }], |
| 472 ], # end 'conditions' | 527 ], # end 'conditions' |
| 473 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details | 528 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details |
| 474 'xcode_settings': { | 529 'xcode_settings': { |
| 475 'SYMROOT': '<(DEPTH)/xcodebuild', | 530 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 476 }, | 531 }, |
| 477 } | 532 } |
| OLD | NEW |