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

Side by Side Diff: gyp/common_conditions.gypi

Issue 184753003: Remove more flags not needed by android framework. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 9 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 '-U_FORTIFY_SOURCE', 218 '-U_FORTIFY_SOURCE',
219 '-D_FORTIFY_SOURCE=1', 219 '-D_FORTIFY_SOURCE=1',
220 ], 220 ],
221 'cflags!': [ 221 'cflags!': [
222 '-g', 222 '-g',
223 '-march=armv7-a', 223 '-march=armv7-a',
224 '-mthumb', 224 '-mthumb',
225 '-mfpu=neon', 225 '-mfpu=neon',
226 '-mfloat-abi=softfp', 226 '-mfloat-abi=softfp',
227 ], 227 ],
228 'cflags!': [
reed1 2014/03/25 14:20:16 // add comments for the "why" of disabling these?
scroggo 2014/03/25 14:38:11 Done.
229 '-g',
230 '-march=armv7-a',
231 '-mthumb',
232 '-mfpu=neon',
233 '-mfloat-abi=softfp',
234 # This flag is not supported by Android build system.
235 '-Wno-c++11-extensions',
236 '-fno-exceptions',
237 '-fstrict-aliasing',
238 '-Wall',
239 '-Wextra',
240 '-Winit-self',
241 '-Wpointer-arith',
242 ],
243 'cflags_cc!': [
244 '-fno-rtti',
245 '-Wnon-virtual-dtor',
246 ],
228 'defines': [ 247 'defines': [
229 'DCT_IFAST_SUPPORTED', 248 'DCT_IFAST_SUPPORTED',
230 # using freetype's embolden allows us to adjust fake bold settings at 249 # using freetype's embolden allows us to adjust fake bold settings at
231 # draw-time, at which point we know which SkTypeface is being drawn 250 # draw-time, at which point we know which SkTypeface is being drawn
232 'SK_USE_FREETYPE_EMBOLDEN', 251 'SK_USE_FREETYPE_EMBOLDEN',
233 # Android provides at least FreeType 2.4.0 at runtime. 252 # Android provides at least FreeType 2.4.0 at runtime.
234 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', 253 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400',
235 # Skia should not use dlopen on Android. 254 # Skia should not use dlopen on Android.
236 'SK_CAN_USE_DLOPEN=0', 255 'SK_CAN_USE_DLOPEN=0',
237 ], 256 ],
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 ], 519 ],
501 'cflags': [ 520 'cflags': [
502 '-fuse-ld=gold', 521 '-fuse-ld=gold',
503 ], 522 ],
504 'conditions': [ 523 'conditions': [
505 [ 'skia_android_framework', { 524 [ 'skia_android_framework', {
506 'libraries!': [ 525 'libraries!': [
507 '-lstdc++', 526 '-lstdc++',
508 '-lm', 527 '-lm',
509 ], 528 ],
529 'cflags!': [
530 '-fuse-ld=gold',
531 ],
510 }], 532 }],
511 [ 'skia_shared_lib', { 533 [ 'skia_shared_lib', {
512 'cflags': [ 534 'cflags': [
513 '-fPIC', 535 '-fPIC',
514 ], 536 ],
515 'defines': [ 537 'defines': [
516 'SKIA_DLL', 538 'SKIA_DLL',
517 'SKIA_IMPLEMENTATION=1', 539 'SKIA_IMPLEMENTATION=1',
518 ], 540 ],
519 }], 541 }],
(...skipping 10 matching lines...) Expand all
530 'defines': [ 552 'defines': [
531 'SK_USE_POSIX_THREADS', 553 'SK_USE_POSIX_THREADS',
532 ], 554 ],
533 }], 555 }],
534 ], # end 'conditions' 556 ], # end 'conditions'
535 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 557 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
536 'xcode_settings': { 558 'xcode_settings': {
537 'SYMROOT': '<(DEPTH)/xcodebuild', 559 'SYMROOT': '<(DEPTH)/xcodebuild',
538 }, 560 },
539 } 561 }
OLDNEW
« 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