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

Side by Side Diff: gyp/common_conditions.gypi

Issue 864043005: Setup Android framework builds to use the appropriate shared lib defines. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 10 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_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)', 8 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)',
9 ], 9 ],
10 'conditions' : [ 10 'conditions' : [
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 ], 347 ],
348 'cflags': [ 348 'cflags': [
349 # Skia does not enforce this usage pattern so we disable it here to avoi d 349 # Skia does not enforce this usage pattern so we disable it here to avoi d
350 # unecessary log spew when building 350 # unecessary log spew when building
351 '-Wno-unused-parameter', 351 '-Wno-unused-parameter',
352 352
353 # Android's -D_FORTIFY_SOURCE=2 extensions are incompatibile with SkStri ng. 353 # Android's -D_FORTIFY_SOURCE=2 extensions are incompatibile with SkStri ng.
354 # Revert to -D_FORTIFY_SOURCE=1 354 # Revert to -D_FORTIFY_SOURCE=1
355 '-U_FORTIFY_SOURCE', 355 '-U_FORTIFY_SOURCE',
356 '-D_FORTIFY_SOURCE=1', 356 '-D_FORTIFY_SOURCE=1',
357
358 # We can't use the skia_shared_library gyp setting because we need to
scroggo 2015/01/27 16:50:10 FWIW, part of the problem is that our defines are
359 # isolate this define to Skia sources. CFLAGS are local to Android.mk
360 # and ensures that this define is not exported to clients of the library
361 '-DSKIA_IMPLEMENTATION=1',
357 ], 362 ],
358 # Remove flags which are either unnecessary or problematic for the 363 # Remove flags which are either unnecessary or problematic for the
359 # Android framework build. Many of these flags are removed simply because 364 # Android framework build. Many of these flags are removed simply because
360 # they were not previously in the Android framework makefile, and we did 365 # they were not previously in the Android framework makefile, and we did
361 # did not intend to add them when generating the makefile. 366 # did not intend to add them when generating the makefile.
362 # TODO (scroggo): Investigate whether any of these flags are actually 367 # TODO (scroggo): Investigate whether any of these flags are actually
363 # needed/would be beneficial. 368 # needed/would be beneficial.
364 'cflags!': [ 369 'cflags!': [
365 # Android has one makefile, used for both debugging (after manual 370 # Android has one makefile, used for both debugging (after manual
366 # modification) and release. Turn off debug info by default. 371 # modification) and release. Turn off debug info by default.
(...skipping 25 matching lines...) Expand all
392 # When built as part of the system image we can enable certian non-NDK 397 # When built as part of the system image we can enable certian non-NDK
393 # compliant optimizations. 398 # compliant optimizations.
394 'SK_BUILD_FOR_ANDROID_FRAMEWORK', 399 'SK_BUILD_FOR_ANDROID_FRAMEWORK',
395 # Optimizations for chromium (m30) 400 # Optimizations for chromium (m30)
396 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"', 401 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"',
397 'IGNORE_ROT_AA_RECT_OPT', 402 'IGNORE_ROT_AA_RECT_OPT',
398 'SkLONGLONG int64_t', 403 'SkLONGLONG int64_t',
399 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', 404 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)',
400 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', 405 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)',
401 'SK_IGNORE_ETC1_SUPPORT', 406 'SK_IGNORE_ETC1_SUPPORT',
407 # We can't use the skia_shared_library gyp setting because we need expos e
408 # this define globally and the the implemention define as a cflag.
409 'SKIA_DLL',
402 # Defines from skia_for_android_framework_defines.gypi 410 # Defines from skia_for_android_framework_defines.gypi
403 '<@(skia_for_android_framework_defines)', 411 '<@(skia_for_android_framework_defines)',
404 ], 412 ],
405 }], 413 }],
406 414
407 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ', 415 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ',
408 { 416 {
409 'defines': [ 417 'defines': [
410 'SK_SAMPLES_FOR_X', 418 'SK_SAMPLES_FOR_X',
411 'SK_BUILD_FOR_UNIX', 419 'SK_BUILD_FOR_UNIX',
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 [ 'skia_is_bot', { 654 [ 'skia_is_bot', {
647 'defines': [ 'SK_CRASH_HANDLER' ], 655 'defines': [ 'SK_CRASH_HANDLER' ],
648 }], 656 }],
649 657
650 ], # end 'conditions' 658 ], # end 'conditions'
651 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 659 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
652 'xcode_settings': { 660 'xcode_settings': {
653 'SYMROOT': '<(DEPTH)/xcodebuild', 661 'SYMROOT': '<(DEPTH)/xcodebuild',
654 }, 662 },
655 } 663 }
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