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

Side by Side Diff: build/common.gypi

Issue 7352014: Revert "Add COMPONENT_BUILD global define. " (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « base/logging.h ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 'win_debug_RuntimeLibrary%': '1', # 1 = /MTd (debug static) 687 'win_debug_RuntimeLibrary%': '1', # 1 = /MTd (debug static)
688 }], 688 }],
689 ], 689 ],
690 }, 690 },
691 'conditions': [ 691 'conditions': [
692 ['branding=="Chrome"', { 692 ['branding=="Chrome"', {
693 'defines': ['GOOGLE_CHROME_BUILD'], 693 'defines': ['GOOGLE_CHROME_BUILD'],
694 }, { # else: branding!="Chrome" 694 }, { # else: branding!="Chrome"
695 'defines': ['CHROMIUM_BUILD'], 695 'defines': ['CHROMIUM_BUILD'],
696 }], 696 }],
697 ['component=="shared_library"', {
698 'defines': ['COMPONENT_BUILD'],
699 }],
700 ['toolkit_views==1', { 697 ['toolkit_views==1', {
701 'defines': ['TOOLKIT_VIEWS=1'], 698 'defines': ['TOOLKIT_VIEWS=1'],
702 }], 699 }],
703 ['toolkit_uses_pure_views==1', { 700 ['toolkit_uses_pure_views==1', {
704 'defines': ['TOOLKIT_USES_PURE_VIEWS=1'], 701 'defines': ['TOOLKIT_USES_PURE_VIEWS=1'],
705 }], 702 }],
706 ['views_compositor==1', { 703 ['views_compositor==1', {
707 'defines': ['VIEWS_COMPOSITOR=1'], 704 'defines': ['VIEWS_COMPOSITOR=1'],
708 }], 705 }],
709 ['chromeos==1', { 706 ['chromeos==1', {
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
918 # We use "POSIX" to refer to all non-Windows operating systems. 915 # We use "POSIX" to refer to all non-Windows operating systems.
919 ['OS=="win"', { 916 ['OS=="win"', {
920 'sources/': [ ['exclude', '_posix\\.(h|cc)$'] ], 917 'sources/': [ ['exclude', '_posix\\.(h|cc)$'] ],
921 # turn on warnings for signed/unsigned mismatch on chromium code. 918 # turn on warnings for signed/unsigned mismatch on chromium code.
922 'msvs_settings': { 919 'msvs_settings': {
923 'VCCLCompilerTool': { 920 'VCCLCompilerTool': {
924 'AdditionalOptions': ['/we4389'], 921 'AdditionalOptions': ['/we4389'],
925 }, 922 },
926 }, 923 },
927 }], 924 }],
928 ['OS=="win" and component=="shared_library"', {
929 'msvs_disabled_warnings': [
930 4251, # class 'std::xx' needs to have dll-interface.
931 ],
932 }],
933 ['chromeos!=1', { 925 ['chromeos!=1', {
934 'sources/': [ ['exclude', '_chromeos\\.(h|cc)$'] ] 926 'sources/': [ ['exclude', '_chromeos\\.(h|cc)$'] ]
935 }], 927 }],
936 ['toolkit_views==0', { 928 ['toolkit_views==0', {
937 'sources/': [ ['exclude', '_views\\.(h|cc)$'] ] 929 'sources/': [ ['exclude', '_views\\.(h|cc)$'] ]
938 }], 930 }],
939 ], 931 ],
940 }], 932 }],
941 ], # target_conditions for 'target_defaults' 933 ], # target_conditions for 'target_defaults'
942 'default_configuration': 'Debug', 934 'default_configuration': 'Debug',
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after
1844 # settings in target dicts. SYMROOT is a special case, because many other 1836 # settings in target dicts. SYMROOT is a special case, because many other
1845 # Xcode variables depend on it, including variables such as 1837 # Xcode variables depend on it, including variables such as
1846 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 1838 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
1847 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 1839 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
1848 # files to appear (when present) in the UI as actual files and not red 1840 # files to appear (when present) in the UI as actual files and not red
1849 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 1841 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
1850 # and therefore SYMROOT, needs to be set at the project level. 1842 # and therefore SYMROOT, needs to be set at the project level.
1851 'SYMROOT': '<(DEPTH)/xcodebuild', 1843 'SYMROOT': '<(DEPTH)/xcodebuild',
1852 }, 1844 },
1853 } 1845 }
OLDNEW
« no previous file with comments | « base/logging.h ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698