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

Side by Side Diff: chrome/chrome_exe.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 unified diff | Download patch
« no previous file with comments | « chrome/app/app_asan.saves ('k') | tools/valgrind/asan/asan_symbolize.py » ('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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'chrome', 8 'target_name': 'chrome',
9 'type': 'none', 9 'type': 'none',
10 'dependencies': [ 'chrome_initial', ], 10 'dependencies': [ 'chrome_initial', ],
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 'xcode_settings': { 83 'xcode_settings': {
84 'CHROMIUM_STRIP_SAVE_FILE': 'app/app.saves', 84 'CHROMIUM_STRIP_SAVE_FILE': 'app/app.saves',
85 'INFOPLIST_FILE': 'app/app-Info.plist', 85 'INFOPLIST_FILE': 'app/app-Info.plist',
86 }, 86 },
87 'conditions': [ 87 'conditions': [
88 ['order_profiling!=0 and (chromeos==1 or OS=="linux")', { 88 ['order_profiling!=0 and (chromeos==1 or OS=="linux")', {
89 'dependencies' : [ 89 'dependencies' : [
90 '../tools/cygprofile/cygprofile.gyp:cygprofile', 90 '../tools/cygprofile/cygprofile.gyp:cygprofile',
91 ], 91 ],
92 }], 92 }],
93 ## ['asan==1', {
94 ## 'xcode_settings': {
95 ## 'CHROMIUM_STRIP_SAVE_FILE': 'app/app_asan.saves',
96 ## 'STRIPFLAGS': '-s $(CHROMIUM_STRIP_SAVE_FILE)',
97 ## },
98 ## }],
93 ['order_text_section!=""', { 99 ['order_text_section!=""', {
94 'target_conditions' : [ 100 'target_conditions' : [
95 ['_toolset=="target"', { 101 ['_toolset=="target"', {
96 'ldflags': [ 102 'ldflags': [
97 '-Wl,-section-ordering-file=<(order_text_section)' ], 103 '-Wl,-section-ordering-file=<(order_text_section)' ],
98 }], 104 }],
99 ] 105 ]
100 }], 106 }],
101 ['OS == "android"', { 107 ['OS == "android"', {
102 # Don't put the 'chrome' target in 'all' on android 108 # Don't put the 'chrome' target in 'all' on android
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 'dependencies': [ 694 'dependencies': [
689 'chrome_nacl_win64', 695 'chrome_nacl_win64',
690 ], 696 ],
691 }], 697 }],
692 ], 698 ],
693 }, 699 },
694 ], 700 ],
695 }], 701 }],
696 ], 702 ],
697 } 703 }
OLDNEW
« no previous file with comments | « chrome/app/app_asan.saves ('k') | tools/valgrind/asan/asan_symbolize.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698