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: trunk/src/build/common.gypi

Issue 14882004: Revert 198834 "Add chrome_split_dll gyp variable, and duplicate ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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 | « no previous file | trunk/src/chrome/app/chrome_main_delegate.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 870 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 # but that doesn't work as we'd like. 881 # but that doesn't work as we'd like.
882 'msvs_debug_link_incremental%': '2', 882 'msvs_debug_link_incremental%': '2',
883 883
884 # Needed for some of the largest modules. 884 # Needed for some of the largest modules.
885 'msvs_debug_link_nonincremental%': '1', 885 'msvs_debug_link_nonincremental%': '1',
886 886
887 # Turns on Use Library Dependency Inputs for linking chrome.dll on Windows 887 # Turns on Use Library Dependency Inputs for linking chrome.dll on Windows
888 # to get incremental linking to be faster in debug builds. 888 # to get incremental linking to be faster in debug builds.
889 'incremental_chrome_dll%': '0', 889 'incremental_chrome_dll%': '0',
890 890
891 # Experimental setting to break chrome.dll in to chrome_browser.dll and
892 # chrome_child.dll.
893 'chrome_split_dll%': '0',
894
895 # The default settings for third party code for treating 891 # The default settings for third party code for treating
896 # warnings-as-errors. Ideally, this would not be required, however there 892 # warnings-as-errors. Ideally, this would not be required, however there
897 # is some third party code that takes a long time to fix/roll. So, this 893 # is some third party code that takes a long time to fix/roll. So, this
898 # flag allows us to have warnings as errors in general to prevent 894 # flag allows us to have warnings as errors in general to prevent
899 # regressions in most modules, while working on the bits that are 895 # regressions in most modules, while working on the bits that are
900 # remaining. 896 # remaining.
901 'win_third_party_warn_as_error%': 'true', 897 'win_third_party_warn_as_error%': 'true',
902 898
903 # This is the location of the sandbox binary. Chrome looks for this before 899 # This is the location of the sandbox binary. Chrome looks for this before
904 # running the zygote process. If found, and SUID, it will be used to 900 # running the zygote process. If found, and SUID, it will be used to
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after
1806 'cflags_cc+': [ 1802 'cflags_cc+': [
1807 '-frtti', 1803 '-frtti',
1808 '-gline-tables-only', 1804 '-gline-tables-only',
1809 '-fintercept-allocation-functions', 1805 '-fintercept-allocation-functions',
1810 ], 1806 ],
1811 'defines': ['TYPE_PROFILING'], 1807 'defines': ['TYPE_PROFILING'],
1812 'dependencies': [ 1808 'dependencies': [
1813 '<(DEPTH)/base/allocator/allocator.gyp:type_profiler', 1809 '<(DEPTH)/base/allocator/allocator.gyp:type_profiler',
1814 ], 1810 ],
1815 }], 1811 }],
1816 ['chrome_split_dll', {
1817 'defines': ['CHROME_SPLIT_DLL'],
1818 }],
1819 ['OS=="linux" and clang==1 and host_arch=="ia32"', { 1812 ['OS=="linux" and clang==1 and host_arch=="ia32"', {
1820 # TODO(dmikurube): Remove -Wno-sentinel when Clang/LLVM is fixed. 1813 # TODO(dmikurube): Remove -Wno-sentinel when Clang/LLVM is fixed.
1821 # See http://crbug.com/162818. 1814 # See http://crbug.com/162818.
1822 'cflags+': ['-Wno-sentinel'], 1815 'cflags+': ['-Wno-sentinel'],
1823 }], 1816 }],
1824 ['OS=="win" and "<(msbuild_toolset)"!=""', { 1817 ['OS=="win" and "<(msbuild_toolset)"!=""', {
1825 'msbuild_toolset': '<(msbuild_toolset)', 1818 'msbuild_toolset': '<(msbuild_toolset)',
1826 }], 1819 }],
1827 ['branding=="Chrome"', { 1820 ['branding=="Chrome"', {
1828 'defines': ['GOOGLE_CHROME_BUILD'], 1821 'defines': ['GOOGLE_CHROME_BUILD'],
(...skipping 2614 matching lines...) Expand 10 before | Expand all | Expand 10 after
4443 # settings in target dicts. SYMROOT is a special case, because many other 4436 # settings in target dicts. SYMROOT is a special case, because many other
4444 # Xcode variables depend on it, including variables such as 4437 # Xcode variables depend on it, including variables such as
4445 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4438 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4446 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4439 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4447 # files to appear (when present) in the UI as actual files and not red 4440 # files to appear (when present) in the UI as actual files and not red
4448 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4441 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4449 # and therefore SYMROOT, needs to be set at the project level. 4442 # and therefore SYMROOT, needs to be set at the project level.
4450 'SYMROOT': '<(DEPTH)/xcodebuild', 4443 'SYMROOT': '<(DEPTH)/xcodebuild',
4451 }, 4444 },
4452 } 4445 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/app/chrome_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698