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

Side by Side Diff: Source/core/core.gyp

Issue 101693004: Move remaining core/platform/mac files to platform/mac (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Retry fixing the compile problem Created 6 years, 11 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 | Source/core/core.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright (C) 2009 Google Inc. All rights reserved. 2 # Copyright (C) 2009 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 ], 443 ],
444 'export_dependent_settings': [ 444 'export_dependent_settings': [
445 '<(DEPTH)/build/linux/system.gyp:gtk', 445 '<(DEPTH)/build/linux/system.gyp:gtk',
446 ], 446 ],
447 }], 447 }],
448 ['OS=="android"', { 448 ['OS=="android"', {
449 'sources/': [ 449 'sources/': [
450 ['exclude', 'accessibility/'], 450 ['exclude', 'accessibility/'],
451 ], 451 ],
452 }], 452 }],
453 ['OS=="mac"', {
454 'direct_dependent_settings': {
455 'defines': [
456 # Chromium's version of WebCore includes the following Objective-C
457 # classes. The system-provided WebCore framework may also provide
458 # these classes. Because of the nature of Objective-C binding
459 # (dynamically at runtime), it's possible for the
460 # Chromium-provided versions to interfere with the system-provided
461 # versions. This may happen when a system framework attempts to
462 # use core.framework, such as when converting an HTML-flavored
463 # string to an NSAttributedString. The solution is to force
464 # Objective-C class names that would conflict to use alternate
465 # names.
466 #
467 # This list will hopefully shrink but may also grow. Its
468 # performance is monitored by the "Check Objective-C Rename"
469 # postbuild step, and any suspicious-looking symbols not handled
470 # here or whitelisted in that step will cause a build failure.
471 #
472 # If this is unhandled, the console will receive log messages
473 # such as:
474 # com.google.Chrome[] objc[]: Class ScrollbarPrefsObserver is impl emented in both .../Google Chrome.app/Contents/Versions/.../Google Chrome Helper .app/Contents/MacOS/../../../Google Chrome Framework.framework/Google Chrome Fra mework and /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/Web Core.framework/Versions/A/WebCore. One of the two will be used. Which one is und efined.
475 'WebCoreFlippedView=ChromiumWebCoreObjCWebCoreFlippedView',
476 'WebCoreTextFieldCell=ChromiumWebCoreObjCWebCoreTextFieldCell',
477 'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCore RenderThemeNotificationObserver',
478 ],
479 'postbuilds': [
480 {
481 # This step ensures that any Objective-C names that aren't
482 # redefined to be "safe" above will cause a build failure.
483 'postbuild_name': 'Check Objective-C Rename',
484 'variables': {
485 'class_whitelist_regex':
486 'ChromiumWebCoreObjC|TCMVisibleView|RTCMFlippedView|Scroll erStyleObserver',
487 'category_whitelist_regex':
488 'TCMInterposing|ScrollAnimatorChromiumMacExt|WebCoreTheme' ,
489 },
490 'action': [
491 '../build/scripts/check_objc_rename.sh',
492 '<(class_whitelist_regex)',
493 '<(category_whitelist_regex)',
494 ],
495 },
496 ],
497 },
498 }],
499 ['OS in ("linux", "android") and "WTF_USE_WEBAUDIO_IPP=1" in feature_def ines', { 453 ['OS in ("linux", "android") and "WTF_USE_WEBAUDIO_IPP=1" in feature_def ines', {
500 'direct_dependent_settings': { 454 'direct_dependent_settings': {
501 'cflags': [ 455 'cflags': [
502 '<!@(pkg-config --cflags-only-I ipp)', 456 '<!@(pkg-config --cflags-only-I ipp)',
503 ], 457 ],
504 }, 458 },
505 }], 459 }],
506 ['"WTF_USE_WEBAUDIO_FFMPEG=1" in feature_defines', { 460 ['"WTF_USE_WEBAUDIO_FFMPEG=1" in feature_defines', {
507 # This directory needs to be on the include path for multiple sub-targ ets of webcore. 461 # This directory needs to be on the include path for multiple sub-targ ets of webcore.
508 'direct_dependent_settings': { 462 'direct_dependent_settings': {
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 'sources/': [ 569 'sources/': [
616 # Additional files from the WebCore Mac build that are presently 570 # Additional files from the WebCore Mac build that are presently
617 # used in the WebCore Chromium Mac build too. 571 # used in the WebCore Chromium Mac build too.
618 572
619 # The Mac build is USE(CF). 573 # The Mac build is USE(CF).
620 ['include', 'CF\\.cpp$'], 574 ['include', 'CF\\.cpp$'],
621 575
622 # Cherry-pick some files that can't be included by broader regexps. 576 # Cherry-pick some files that can't be included by broader regexps.
623 # Some of these are used instead of Chromium platform files, see 577 # Some of these are used instead of Chromium platform files, see
624 # the specific exclusions in the "exclude" list below. 578 # the specific exclusions in the "exclude" list below.
625 ['include', 'platform/mac/ThemeMac\\.h$'],
626 ['include', 'platform/mac/ThemeMac\\.mm$'],
627 ['include', 'platform/mac/WebCoreSystemInterface\\.h$'], 579 ['include', 'platform/mac/WebCoreSystemInterface\\.h$'],
628 ['include', 'platform/mac/WebCoreTextRenderer\\.mm$'], 580 ['include', 'platform/mac/WebCoreTextRenderer\\.mm$'],
629 ['include', 'platform/text/mac/ShapeArabic\\.c$'], 581 ['include', 'platform/text/mac/ShapeArabic\\.c$'],
630 ['include', 'platform/text/mac/String(Impl)?Mac\\.mm$'], 582 ['include', 'platform/text/mac/String(Impl)?Mac\\.mm$'],
631 # Use USE_NEW_THEME on Mac. 583 # Use USE_NEW_THEME on Mac.
632 ['include', 'platform/Theme\\.cpp$'], 584 ['include', 'platform/Theme\\.cpp$'],
633 ], 585 ],
634 }], 586 }],
635 ['OS=="win"', { 587 ['OS=="win"', {
636 'sources/': [ 588 'sources/': [
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRect.h', 852 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRect.h',
901 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.cpp', 853 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.cpp',
902 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.h', 854 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.h',
903 ], 855 ],
904 'sources/': [ 856 'sources/': [
905 ['exclude', 'testing/js'], 857 ['exclude', 'testing/js'],
906 ], 858 ],
907 }, 859 },
908 ], # targets 860 ], # targets
909 } 861 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/core.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698