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

Side by Side Diff: chrome/chrome.gyp

Issue 728233003: Reland https://codereview.chromium.org/292153006 with minor changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use strip -x for both non-ASan and ASan builds Created 6 years 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 | « chrome/app/app_asan.saves ('k') | chrome/chrome_exe.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 # 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 'variables': { 255 'variables': {
256 # A real .dSYM is needed for dump_syms to operate on. 256 # A real .dSYM is needed for dump_syms to operate on.
257 'mac_real_dsym': 1, 257 'mac_real_dsym': 1,
258 }, 258 },
259 'xcode_settings': { 259 'xcode_settings': {
260 # With mac_real_dsym set, strip_from_xcode won't be used. 260 # With mac_real_dsym set, strip_from_xcode won't be used.
261 # Specify CHROMIUM_STRIP_SAVE_FILE directly to Xcode. 261 # Specify CHROMIUM_STRIP_SAVE_FILE directly to Xcode.
262 'STRIPFLAGS': '-s $(CHROMIUM_STRIP_SAVE_FILE)', 262 'STRIPFLAGS': '-s $(CHROMIUM_STRIP_SAVE_FILE)',
263 }, 263 },
264 }], 264 }],
265 ['asan==1', {
266 'xcode_settings': {
267 # Override the outer definition of CHROMIUM_STRIP_SAVE_FILE.
268 'CHROMIUM_STRIP_SAVE_FILE': 'app/app_asan.saves',
269 },
270 }],
271 ['component=="shared_library"', { 265 ['component=="shared_library"', {
272 'xcode_settings': { 266 'xcode_settings': {
273 'LD_RUNPATH_SEARCH_PATHS': [ 267 'LD_RUNPATH_SEARCH_PATHS': [
274 # Get back from Chromium.app/Contents/Versions/V/ 268 # Get back from Chromium.app/Contents/Versions/V/
275 # Helper.app/Contents/MacOS 269 # Helper.app/Contents/MacOS
276 '@loader_path/../../../../../../..', 270 '@loader_path/../../../../../../..',
277 ], 271 ],
278 }, 272 },
279 }], 273 }],
280 ], 274 ],
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 'service/service_utility_process_host.cc', 774 'service/service_utility_process_host.cc',
781 'service/service_utility_process_host.h', 775 'service/service_utility_process_host.h',
782 ], 776 ],
783 }], 777 }],
784 ], 778 ],
785 }, 779 },
786 ], 780 ],
787 }], 781 }],
788 ], # 'conditions' 782 ], # 'conditions'
789 } 783 }
OLDNEW
« no previous file with comments | « chrome/app/app_asan.saves ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698