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

Unified Diff: build/common.gypi

Issue 728233003: Reland https://codereview.chromium.org/292153006 with minor changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/asan.saves ('k') | chrome/app/app_asan.saves » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 21cee7ff09d40c67f2dfd62f6465585792758386..ff4ef75a6b4a0ceee68315976b2622a73a9f79d8 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2161,7 +2161,7 @@
['asan==1 and OS=="mac"', {
# TODO(glider): we do not strip ASan binaries until the dynamic ASan
# runtime is fully adopted. See http://crbug.com/242503.
- 'mac_strip_release': 0,
+ 'mac_strip_release': 1,
}],
['tsan==1', {
'use_custom_libcxx%': 1,
@@ -5082,10 +5082,10 @@
'conditions': [
['asan==1', {
'variables': {
- 'asan_saves_file': 'asan.saves',
+ 'asan_saves_file_path': 'asan.saves',
},
'xcode_settings': {
- 'CHROMIUM_STRIP_SAVE_FILE': '<(asan_saves_file)',
+ 'CHROMIUM_STRIP_SAVE_FILE': '<(asan_saves_file_path)',
},
}],
],
@@ -5119,23 +5119,29 @@
'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym',
'DEPLOYMENT_POSTPROCESSING': 'YES',
'STRIP_INSTALLED_PRODUCT': 'YES',
- 'target_conditions': [
- ['_type=="shared_library" or _type=="loadable_module"', {
- # The Xcode default is to strip debugging symbols
- # only (-S). Local symbols should be stripped as
- # well, which will be handled by -x. Xcode will
- # continue to insert -S when stripping even when
- # additional flags are added with STRIPFLAGS.
- 'STRIPFLAGS': '-x',
- }], # _type=="shared_library" or _type=="loadable_module"
- ['_type=="executable"', {
- 'conditions': [
- ['asan==1', {
- 'STRIPFLAGS': '-s $(CHROMIUM_STRIP_SAVE_FILE)',
- }]
- ],
- }], # _type=="executable" and asan==1
- ], # target_conditions
+ 'conditions': [
+ ['asan==0', {
+ 'target_conditions': [
+ ['_type=="shared_library" or _type=="loadable_module"', {
+ # The Xcode default is to strip debugging symbols
+ # only (-S). Local symbols should be stripped as
+ # well, which will be handled by -x. Xcode will
+ # continue to insert -S when stripping even when
+ # additional flags are added with STRIPFLAGS.
+ 'STRIPFLAGS': '-x',
+ }], # _type=="shared_library" or _type=="loadable_module"
+## ['_type=="executable"', {
+## 'conditions': [
+## ['asan==1', {
+## 'STRIPFLAGS': '-s $(CHROMIUM_STRIP_SAVE_FILE)',
+## }],
+## ],
+## }], # _type=="executable" and asan==1
+ ], # target_conditions
+ }, {
+ 'STRIPFLAGS': '-S',
+ }],
+ ],
}, # xcode_settings
}, # configuration "Release"
}, # configurations
« no previous file with comments | « build/asan.saves ('k') | chrome/app/app_asan.saves » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698