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

Side by Side Diff: build/common.gypi

Issue 23868020: Fix remaining shared_library link_settings propagation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 2 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 | « base/base.gyp ('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) 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 1891 matching lines...) Expand 10 before | Expand all | Expand 10 after
1902 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm l 1902 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm l
1903 'mac_release_optimization%': 's', # Use -Os unless overridden 1903 'mac_release_optimization%': 's', # Use -Os unless overridden
1904 'mac_debug_optimization%': '0', # Use -O0 unless overridden 1904 'mac_debug_optimization%': '0', # Use -O0 unless overridden
1905 }, { 1905 }, {
1906 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm l 1906 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm l
1907 'mac_release_optimization%': '3', # Use -O3 unless overridden 1907 'mac_release_optimization%': '3', # Use -O3 unless overridden
1908 'mac_debug_optimization%': '0', # Use -O0 unless overridden 1908 'mac_debug_optimization%': '0', # Use -O0 unless overridden
1909 }], 1909 }],
1910 ], 1910 ],
1911 }, 1911 },
1912 # Temporary flag to test shared_library link_settings propagation.
1913 'allow_sharedlib_linksettings_propagation': 0,
1912 'defines': [ 1914 'defines': [
1913 # Set this to use the new DX11 version of ANGLE. 1915 # Set this to use the new DX11 version of ANGLE.
1914 # TODO(apatrick): Remove this when the transition is complete. 1916 # TODO(apatrick): Remove this when the transition is complete.
1915 'ANGLE_DX11', 1917 'ANGLE_DX11',
1916 ], 1918 ],
1917 'conditions': [ 1919 'conditions': [
1918 ['(OS=="mac" or OS=="ios") and asan==1', { 1920 ['(OS=="mac" or OS=="ios") and asan==1', {
1919 'dependencies': [ 1921 'dependencies': [
1920 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', 1922 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime',
1921 ], 1923 ],
(...skipping 2804 matching lines...) Expand 10 before | Expand all | Expand 10 after
4726 # settings in target dicts. SYMROOT is a special case, because many other 4728 # settings in target dicts. SYMROOT is a special case, because many other
4727 # Xcode variables depend on it, including variables such as 4729 # Xcode variables depend on it, including variables such as
4728 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4730 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4729 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4731 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4730 # files to appear (when present) in the UI as actual files and not red 4732 # files to appear (when present) in the UI as actual files and not red
4731 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4733 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4732 # and therefore SYMROOT, needs to be set at the project level. 4734 # and therefore SYMROOT, needs to be set at the project level.
4733 'SYMROOT': '<(DEPTH)/xcodebuild', 4735 'SYMROOT': '<(DEPTH)/xcodebuild',
4734 }, 4736 },
4735 } 4737 }
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698