| OLD | NEW |
| 1 # Copyright (C) 2013 Google Inc. All rights reserved. | 1 # Copyright (C) 2013 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 { | 28 { |
| 29 'includes': [ | 29 'includes': [ |
| 30 '../build/win/precompile.gypi', | 30 '../build/win/precompile.gypi', |
| 31 'wtf.gypi', | 31 'wtf.gypi', |
| 32 ], | 32 ], |
| 33 'targets': [ | 33 'targets': [ |
| 34 { | 34 { |
| 35 'target_name': 'wtf_unittests', | 35 'target_name': 'wtf_unittests', |
| 36 'type': 'executable', | 36 'type': 'executable', |
| 37 'dependencies': [ | 37 'dependencies': [ |
| 38 'wtf_unittest_helpers', | |
| 39 'wtf.gyp:wtf', | 38 'wtf.gyp:wtf', |
| 40 '../config.gyp:unittest_config', | 39 '../config.gyp:unittest_config', |
| 41 '<(DEPTH)/base/base.gyp:test_support_base', | 40 '<(DEPTH)/base/base.gyp:test_support_base', |
| 42 ], | 41 ], |
| 43 'sources': [ | 42 'sources': [ |
| 44 'testing/RunAllTests.cpp', | 43 'testing/RunAllTests.cpp', |
| 45 '<@(wtf_unittest_files)', | 44 '<@(wtf_unittest_files)', |
| 46 ], | 45 ], |
| 47 # Disable c4267 warnings until we fix size_t to int truncations. | 46 # Disable c4267 warnings until we fix size_t to int truncations. |
| 48 'msvs_disabled_warnings': [4127, 4510, 4512, 4610, 4706, 4068, 4267], | 47 'msvs_disabled_warnings': [4127, 4510, 4512, 4610, 4706, 4068, 4267], |
| 49 'conditions': [ | 48 'conditions': [ |
| 50 ['OS=="android"', { | 49 ['OS=="android"', { |
| 51 'type': 'shared_library', | 50 'type': 'shared_library', |
| 52 'dependencies': [ | 51 'dependencies': [ |
| 53 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', | 52 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', |
| 54 '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forwarder2', | 53 '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forwarder2', |
| 55 ], | 54 ], |
| 56 }], | 55 }], |
| 57 ] | 56 ] |
| 58 }, | 57 }, |
| 59 { | |
| 60 'target_name': 'wtf_unittest_helpers', | |
| 61 'type': '<(component)', | |
| 62 'include_dirs': [ | |
| 63 '..', | |
| 64 ], | |
| 65 'dependencies': [ | |
| 66 'wtf.gyp:wtf', | |
| 67 ], | |
| 68 'defines': [ | |
| 69 'WTF_UNITTEST_HELPERS_IMPLEMENTATION=1', | |
| 70 ], | |
| 71 'sources': [ | |
| 72 '<@(wtf_unittest_helper_files)', | |
| 73 ], | |
| 74 }, | |
| 75 ], | 58 ], |
| 76 'conditions': [ | 59 'conditions': [ |
| 77 ['OS=="android" and gtest_target_type=="shared_library"', { | 60 ['OS=="android" and gtest_target_type=="shared_library"', { |
| 78 'targets': [{ | 61 'targets': [{ |
| 79 'target_name': 'wtf_unittests_apk', | 62 'target_name': 'wtf_unittests_apk', |
| 80 'type': 'none', | 63 'type': 'none', |
| 81 'dependencies': [ | 64 'dependencies': [ |
| 82 '<(DEPTH)/base/base.gyp:base_java', | 65 '<(DEPTH)/base/base.gyp:base_java', |
| 83 '<(DEPTH)/net/net.gyp:net_java', | 66 '<(DEPTH)/net/net.gyp:net_java', |
| 84 'wtf_unittests', | 67 'wtf_unittests', |
| (...skipping 16 matching lines...) Expand all Loading... |
| 101 '../../../../build/isolate.gypi', | 84 '../../../../build/isolate.gypi', |
| 102 ], | 85 ], |
| 103 'sources': [ | 86 'sources': [ |
| 104 'wtf_unittests.isolate', | 87 'wtf_unittests.isolate', |
| 105 ], | 88 ], |
| 106 }, | 89 }, |
| 107 ], | 90 ], |
| 108 }], | 91 }], |
| 109 ], | 92 ], |
| 110 } | 93 } |
| OLD | NEW |