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

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: Add comments; remove duplicates. 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_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', 8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)',
9 ], 9 ],
10 'conditions' : [ 10 'conditions' : [
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 'cflags': [ 211 'cflags': [
212 # Skia does not enforce this usage pattern so we disable it here to avoi d 212 # Skia does not enforce this usage pattern so we disable it here to avoi d
213 # unecessary log spew when building 213 # unecessary log spew when building
214 '-Wno-unused-parameter', 214 '-Wno-unused-parameter',
215 215
216 # Android's -D_FORTIFY_SOURCE=2 extensions are incompatibile with SkStri ng. 216 # Android's -D_FORTIFY_SOURCE=2 extensions are incompatibile with SkStri ng.
217 # Revert to -D_FORTIFY_SOURCE=1 217 # Revert to -D_FORTIFY_SOURCE=1
218 '-U_FORTIFY_SOURCE', 218 '-U_FORTIFY_SOURCE',
219 '-D_FORTIFY_SOURCE=1', 219 '-D_FORTIFY_SOURCE=1',
220 ], 220 ],
221 # Remove flags which are either unnecessary or problematic for the
222 # Android framework build. Many of these flags are removed simply because
223 # they were not previously in the Android framework makefile, and we did
224 # did not intend to add them when generating the makefile.
225 # TODO (scroggo): Investigate whether any of these flags are actually
226 # needed/would be beneficial.
221 'cflags!': [ 227 'cflags!': [
228 # Android has one makefile, used for both debugging (after manual
229 # modification) and release. Turn off debug info by default.
222 '-g', 230 '-g',
223 '-march=armv7-a', 231 '-march=armv7-a',
224 '-mthumb', 232 '-mthumb',
225 '-mfpu=neon', 233 '-mfpu=neon',
226 '-mfloat-abi=softfp', 234 '-mfloat-abi=softfp',
235 # This flag is not supported by Android build system.
236 '-Wno-c++11-extensions',
237 '-fno-exceptions',
238 '-fstrict-aliasing',
239 # Remove flags to turn on warnings, since most people building Android
240 # are not focused on Skia and do not need the extra warning info.
241 '-Wall',
242 '-Wextra',
243 '-Winit-self',
244 '-Wpointer-arith',
245 ],
246 'cflags_cc!': [
247 '-fno-rtti',
248 '-Wnon-virtual-dtor',
227 ], 249 ],
228 'defines': [ 250 'defines': [
229 'DCT_IFAST_SUPPORTED', 251 'DCT_IFAST_SUPPORTED',
230 # using freetype's embolden allows us to adjust fake bold settings at 252 # 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 253 # draw-time, at which point we know which SkTypeface is being drawn
232 'SK_USE_FREETYPE_EMBOLDEN', 254 'SK_USE_FREETYPE_EMBOLDEN',
233 # Android provides at least FreeType 2.4.0 at runtime. 255 # Android provides at least FreeType 2.4.0 at runtime.
234 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', 256 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400',
235 # Skia should not use dlopen on Android. 257 # Skia should not use dlopen on Android.
236 'SK_CAN_USE_DLOPEN=0', 258 'SK_CAN_USE_DLOPEN=0',
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 ], 522 ],
501 'cflags': [ 523 'cflags': [
502 '-fuse-ld=gold', 524 '-fuse-ld=gold',
503 ], 525 ],
504 'conditions': [ 526 'conditions': [
505 [ 'skia_android_framework', { 527 [ 'skia_android_framework', {
506 'libraries!': [ 528 'libraries!': [
507 '-lstdc++', 529 '-lstdc++',
508 '-lm', 530 '-lm',
509 ], 531 ],
532 'cflags!': [
533 '-fuse-ld=gold',
534 ],
510 }], 535 }],
511 [ 'skia_shared_lib', { 536 [ 'skia_shared_lib', {
512 'cflags': [ 537 'cflags': [
513 '-fPIC', 538 '-fPIC',
514 ], 539 ],
515 'defines': [ 540 'defines': [
516 'SKIA_DLL', 541 'SKIA_DLL',
517 'SKIA_IMPLEMENTATION=1', 542 'SKIA_IMPLEMENTATION=1',
518 ], 543 ],
519 }], 544 }],
(...skipping 10 matching lines...) Expand all
530 'defines': [ 555 'defines': [
531 'SK_USE_POSIX_THREADS', 556 'SK_USE_POSIX_THREADS',
532 ], 557 ],
533 }], 558 }],
534 ], # end 'conditions' 559 ], # end 'conditions'
535 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 560 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
536 'xcode_settings': { 561 'xcode_settings': {
537 'SYMROOT': '<(DEPTH)/xcodebuild', 562 'SYMROOT': '<(DEPTH)/xcodebuild',
538 }, 563 },
539 } 564 }
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