OLD | NEW |
---|---|
1 # | 1 # |
2 # Copyright (C) 2013 Google Inc. All rights reserved. | 2 # Copyright (C) 2013 Google Inc. All rights reserved. |
3 # | 3 # |
4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
6 # met: | 6 # met: |
7 # | 7 # |
8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
(...skipping 15 matching lines...) Expand all Loading... | |
26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 # | 29 # |
30 { | 30 { |
31 'includes': [ | 31 'includes': [ |
32 '../build/win/precompile.gypi', | 32 '../build/win/precompile.gypi', |
33 'blink_platform.gypi', | 33 'blink_platform.gypi', |
34 ], | 34 ], |
35 'targets': [{ | 35 'targets': [{ |
36 'target_name': 'blink_platform_unittests_support', | |
37 'type': 'static_library', | |
38 'dependencies': [ | |
39 'platform_derived_sources.gyp:make_platform_derived_sources', | |
40 '../config.gyp:unittest_config', | |
41 ], | |
42 'include_dirs': [ | |
43 '<(SHARED_INTERMEDIATE_DIR)/blink', | |
44 ], | |
45 'sources': [ | |
46 '<@(platform_test_support_files)', | |
47 '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.cpp', | |
48 '<(SHARED_INTERMEDIATE_DIR)/blink/RuntimeEnabledFeatures.h', | |
abarth-chromium
2013/12/04 05:45:26
I see, the problem is that you've moved these file
| |
49 ], | |
50 }, { | |
36 'target_name': 'blink_platform_unittests', | 51 'target_name': 'blink_platform_unittests', |
37 'type': 'executable', | 52 'type': 'executable', |
38 'dependencies': [ | 53 'dependencies': [ |
54 'blink_platform_unittests_support', | |
39 'blink_platform.gyp:blink_platform', | 55 'blink_platform.gyp:blink_platform', |
40 'blink_platform.gyp:blink_common', | 56 'blink_platform.gyp:blink_common', |
41 '../config.gyp:unittest_config', | 57 '../config.gyp:unittest_config', |
42 '../wtf/wtf.gyp:wtf', | 58 '../wtf/wtf.gyp:wtf', |
43 '../wtf/wtf_tests.gyp:run_all_tests', | 59 '../wtf/wtf_tests.gyp:run_all_tests', |
44 '../wtf/wtf_tests.gyp:wtf_unittest_helpers', | 60 '../wtf/wtf_tests.gyp:wtf_unittest_helpers', |
45 '<(DEPTH)/url/url.gyp:url_lib', | 61 '<(DEPTH)/url/url.gyp:url_lib', |
46 ], | 62 ], |
63 'include_dirs': [ | |
64 '<(SHARED_INTERMEDIATE_DIR)/blink', | |
65 ], | |
47 'sources': [ | 66 'sources': [ |
48 '<@(platform_test_files)', | 67 '<@(platform_test_files)', |
49 ], | 68 ], |
50 'conditions': [ | 69 'conditions': [ |
51 ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and linux_use_ tcmalloc==1', { | 70 ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and linux_use_ tcmalloc==1', { |
52 'dependencies': [ | 71 'dependencies': [ |
53 '<(DEPTH)/base/base.gyp:base', | 72 '<(DEPTH)/base/base.gyp:base', |
54 '<(DEPTH)/base/allocator/allocator.gyp:allocator', | 73 '<(DEPTH)/base/allocator/allocator.gyp:allocator', |
55 ] | 74 ] |
56 }] | 75 }] |
57 ] | 76 ] |
58 }], | 77 }], |
59 } | 78 } |
OLD | NEW |