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

Side by Side Diff: third_party/instrumented_libraries/instrumented_libraries.gyp

Issue 619723006: Instrumented libraries: remove unnecessary uses of DEPTH from GYP. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « no previous file | third_party/instrumented_libraries/standard_instrumented_package_target.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'variables': { 6 'variables': {
7 'verbose_libraries_build%': 0, 7 'verbose_libraries_build%': 0,
8 'instrumented_libraries_jobs%': 1, 8 'instrumented_libraries_jobs%': 1,
9 }, 9 },
10 10
(...skipping 18 matching lines...) Expand all
29 29
30 'target_defaults': { 30 'target_defaults': {
31 'build_method': 'destdir', 31 'build_method': 'destdir',
32 'extra_configure_flags': [], 32 'extra_configure_flags': [],
33 'jobs': '<(instrumented_libraries_jobs)', 33 'jobs': '<(instrumented_libraries_jobs)',
34 'package_cflags': [ 34 'package_cflags': [
35 '-O2', 35 '-O2',
36 '-gline-tables-only', 36 '-gline-tables-only',
37 '-fPIC', 37 '-fPIC',
38 '-w', 38 '-w',
39 '-U_FORITFY_SOURCE' 39 '-U_FORITFY_SOURCE',
40 '-fno-omit-frame-pointer'
40 ], 41 ],
41 'package_ldflags': [ 42 'package_ldflags': [
42 '-Wl,-z,origin', 43 '-Wl,-z,origin',
43 # We set RPATH=XORIGIN when building the package and replace it with 44 # We set RPATH=XORIGIN when building the package and replace it with
44 # $ORIGIN later. The reason is that this flag goes through configure/make 45 # $ORIGIN later. The reason is that this flag goes through configure/make
45 # differently for different packages. Because of this, we can't escape the 46 # differently for different packages. Because of this, we can't escape the
46 # $ character in a way that would work for every package. 47 # $ character in a way that would work for every package.
47 '-Wl,-R,XORIGIN/.' 48 '-Wl,-R,XORIGIN/.'
48 ], 49 ],
49 'patch': '', 50 'patch': '',
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 'actions': [ 152 'actions': [
152 { 153 {
153 'action_name': 'fix_rpaths', 154 'action_name': 'fix_rpaths',
154 'inputs': [ 155 'inputs': [
155 'fix_rpaths.sh', 156 'fix_rpaths.sh',
156 ], 157 ],
157 'outputs': [ 158 'outputs': [
158 '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)/rpaths.fix ed.txt', 159 '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)/rpaths.fix ed.txt',
159 ], 160 ],
160 'action': [ 161 'action': [
161 '<(DEPTH)/third_party/instrumented_libraries/fix_rpaths.sh', 162 './fix_rpaths.sh',
162 '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)' 163 '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)'
163 ], 164 ],
164 }, 165 },
165 ], 166 ],
166 'direct_dependent_settings': { 167 'direct_dependent_settings': {
167 'target_conditions': [ 168 'target_conditions': [
168 ['_toolset=="target"', { 169 ['_toolset=="target"', {
169 'ldflags': [ 170 'ldflags': [
170 # Add RPATH to result binary to make it linking instrumented libra ries ($ORIGIN means relative RPATH) 171 # Add RPATH to result binary to make it linking instrumented libra ries ($ORIGIN means relative RPATH)
171 '-Wl,-R,\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/lib/:\ $$ORIGIN/instrumented_libraries/<(_sanitizer_type)/usr/lib/x86_64-linux-gnu/', 172 '-Wl,-R,\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/lib/:\ $$ORIGIN/instrumented_libraries/<(_sanitizer_type)/usr/lib/x86_64-linux-gnu/',
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 'package_name': 'dee', 596 'package_name': 'dee',
596 'extra_configure_flags': [ 597 'extra_configure_flags': [
597 # See above. 598 # See above.
598 '--disable-introspection', 599 '--disable-introspection',
599 ], 600 ],
600 'dependencies=': [], 601 'dependencies=': [],
601 'includes': ['standard_instrumented_package_target.gypi'], 602 'includes': ['standard_instrumented_package_target.gypi'],
602 }, 603 },
603 ], 604 ],
604 } 605 }
OLDNEW
« no previous file with comments | « no previous file | third_party/instrumented_libraries/standard_instrumented_package_target.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698