| OLD | NEW |
| 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 ], | 152 ], |
| 153 }], | 153 }], |
| 154 ['tsan==1', { | 154 ['tsan==1', { |
| 155 'dependencies!': [ | 155 'dependencies!': [ |
| 156 '<(_sanitizer_type)-libpng12-0', | 156 '<(_sanitizer_type)-libpng12-0', |
| 157 ], | 157 ], |
| 158 }], | 158 }], |
| 159 ['chromeos==1', { | 159 ['chromeos==1', { |
| 160 'dependencies': [ | 160 'dependencies': [ |
| 161 '<(_sanitizer_type)-brltty', | 161 '<(_sanitizer_type)-brltty', |
| 162 '<(_sanitizer_type)-libva1', |
| 162 ], | 163 ], |
| 163 }] | 164 }] |
| 164 ], | 165 ], |
| 165 'direct_dependent_settings': { | 166 'direct_dependent_settings': { |
| 166 'target_conditions': [ | 167 'target_conditions': [ |
| 167 ['_toolset=="target"', { | 168 ['_toolset=="target"', { |
| 168 'ldflags': [ | 169 'ldflags': [ |
| 169 # Add RPATH to result binary to make it linking instrumented libra
ries ($ORIGIN means relative RPATH) | 170 # Add RPATH to result binary to make it linking instrumented libra
ries ($ORIGIN means relative RPATH) |
| 170 '-Wl,-R,\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/lib/', | 171 '-Wl,-R,\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/lib/', |
| 171 '-Wl,-z,origin', | 172 '-Wl,-z,origin', |
| (...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 686 # We don't need any of those. | 687 # We don't need any of those. |
| 687 '--disable-java-bindings', | 688 '--disable-java-bindings', |
| 688 '--disable-lisp-bindings', | 689 '--disable-lisp-bindings', |
| 689 '--disable-ocaml-bindings', | 690 '--disable-ocaml-bindings', |
| 690 '--disable-python-bindings', | 691 '--disable-python-bindings', |
| 691 '--disable-tcl-bindings' | 692 '--disable-tcl-bindings' |
| 692 ], | 693 ], |
| 693 'dependencies=': [], | 694 'dependencies=': [], |
| 694 'includes': ['standard_instrumented_package_target.gypi'], | 695 'includes': ['standard_instrumented_package_target.gypi'], |
| 695 }, | 696 }, |
| 697 { |
| 698 'package_name': 'libva1', |
| 699 'dependencies=': [], |
| 700 # Backport a use-after-free fix: |
| 701 # http://cgit.freedesktop.org/libva/diff/va/va.c?h=staging&id=d4988142a3f2
256e38c5c5cdcdfc1b4f5f3c1ea9 |
| 702 'patch': 'patches/libva1.diff', |
| 703 'run_before_build': 'scripts/libva1.sh', |
| 704 'includes': ['standard_instrumented_package_target.gypi'], |
| 705 }, |
| 696 ], | 706 ], |
| 697 } | 707 } |
| OLD | NEW |