OLD | NEW |
---|---|
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 'includes': [ | 5 'includes': [ |
6 # While the target 'base' doesn't depend on ../third_party/icu/icu.gyp | 6 # While the target 'base' doesn't depend on ../third_party/icu/icu.gyp |
7 # itself, virtually all targets using it has to include icu. The only | 7 # itself, virtually all targets using it has to include icu. The only |
8 # exception is the Windows sandbox (?). | 8 # exception is the Windows sandbox (?). |
9 '../third_party/icu/icu.isolate', | 9 '../third_party/icu/icu.isolate', |
10 ], | 10 ], |
11 'conditions': [ | 11 'conditions': [ |
12 ['use_custom_libcxx==1', { | 12 ['use_custom_libcxx==1', { |
13 'variables': { | 13 'variables': { |
14 'files': [ | 14 'files': [ |
15 '<(PRODUCT_DIR)/lib/libc++.so', | 15 '<(PRODUCT_DIR)/lib/libc++.so', |
16 ], | 16 ], |
17 }, | 17 }, |
18 }], | 18 }], |
19 ['use_instrumented_libraries==1', { | 19 ['use_instrumented_libraries==1', { |
20 'variables': { | 20 'variables': { |
21 'files': [ | 21 'files': [ |
22 '<(PRODUCT_DIR)/instrumented_libraries/', | 22 '<(PRODUCT_DIR)/instrumented_libraries/', |
23 ], | 23 ], |
24 }, | 24 }, |
25 }], | 25 }], |
26 ['use_prebuilt_instrumented_libraries==1', { | |
M-A Ruel
2015/03/24 13:22:51
I'm not sure it is the right place. Are these file
earthdok
2015/03/24 13:29:29
The files are produced by third_party/instrumented
M-A Ruel
2015/03/24 13:31:12
It is preferable to have the .isolate aside the .g
earthdok
2015/03/24 13:42:11
Done. I should also move lines 12-17 to a separate
M-A Ruel
2015/03/24 13:52:09
Ok
| |
27 'variables': { | |
28 'files': [ | |
29 '<(PRODUCT_DIR)/instrumented_libraries_prebuilt/', | |
30 ], | |
31 }, | |
32 }], | |
26 ['OS=="mac" and asan==1', { | 33 ['OS=="mac" and asan==1', { |
27 'variables': { | 34 'variables': { |
28 'files': [ | 35 'files': [ |
29 '<(PRODUCT_DIR)/libclang_rt.asan_osx_dynamic.dylib', | 36 '<(PRODUCT_DIR)/libclang_rt.asan_osx_dynamic.dylib', |
30 ], | 37 ], |
31 }, | 38 }, |
32 }], | 39 }], |
33 ['OS=="win"', { | 40 ['OS=="win"', { |
34 # Required for base/stack_trace_win.cc to symbolize correctly. | 41 # Required for base/stack_trace_win.cc to symbolize correctly. |
35 'variables': { | 42 'variables': { |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
94 '<(PRODUCT_DIR)/msvcr120.dll', | 101 '<(PRODUCT_DIR)/msvcr120.dll', |
95 ], | 102 ], |
96 }, | 103 }, |
97 }], | 104 }], |
98 # Workaround for https://code.google.com/p/swarming/issues/detail?id=211 | 105 # Workaround for https://code.google.com/p/swarming/issues/detail?id=211 |
99 ['asan==0 or lsan==0 or msan==0 or tsan==0', { | 106 ['asan==0 or lsan==0 or msan==0 or tsan==0', { |
100 'variables': {}, | 107 'variables': {}, |
101 }], | 108 }], |
102 ], | 109 ], |
103 } | 110 } |
OLD | NEW |