| OLD | NEW |
| 1 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license |
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source |
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found |
| 6 # in the file PATENTS. All contributing project authors may | 6 # in the file PATENTS. All contributing project authors may |
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. |
| 8 | 8 |
| 9 { | 9 { |
| 10 'includes': ['../build/common.gypi',], | 10 'includes': ['../build/common.gypi',], |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 ], | 49 ], |
| 50 }], | 50 }], |
| 51 ], | 51 ], |
| 52 # Disable warnings to enable Win64 build, issue 1323. | 52 # Disable warnings to enable Win64 build, issue 1323. |
| 53 'msvs_disabled_warnings': [ | 53 'msvs_disabled_warnings': [ |
| 54 4267, # size_t to int truncation. | 54 4267, # size_t to int truncation. |
| 55 ], | 55 ], |
| 56 }, | 56 }, |
| 57 ], | 57 ], |
| 58 'conditions': [ | 58 'conditions': [ |
| 59 ['include_tests==1 and OS=="android"', { | 59 ['OS=="android"', { |
| 60 'targets': [ | 60 'targets': [ |
| 61 { | 61 { |
| 62 'target_name': 'system_wrappers_unittests_apk_target', | 62 'target_name': 'system_wrappers_unittests_apk_target', |
| 63 'type': 'none', | 63 'type': 'none', |
| 64 'dependencies': [ | 64 'dependencies': [ |
| 65 '<(apk_tests_path):system_wrappers_unittests_apk', | 65 '<(apk_tests_path):system_wrappers_unittests_apk', |
| 66 ], | 66 ], |
| 67 }, | 67 }, |
| 68 ], | 68 ], |
| 69 }], | 69 'conditions': [ |
| 70 ['test_isolation_mode != "noop"', |
| 71 { |
| 72 'targets': [ |
| 73 { |
| 74 'target_name': 'system_wrappers_unittests_apk_run', |
| 75 'type': 'none', |
| 76 'dependencies': [ |
| 77 '<(apk_tests_path):system_wrappers_unittests_apk', |
| 78 ], |
| 79 'includes': [ |
| 80 '../build/isolate.gypi', |
| 81 ], |
| 82 'sources': [ |
| 83 'system_wrappers_unittests_apk.isolate', |
| 84 ], |
| 85 }, |
| 86 ], |
| 87 }, |
| 88 ], |
| 89 ], |
| 90 }], # OS=="android" |
| 70 ['test_isolation_mode != "noop"', { | 91 ['test_isolation_mode != "noop"', { |
| 71 'targets': [ | 92 'targets': [ |
| 72 { | 93 { |
| 73 'target_name': 'system_wrappers_unittests_run', | 94 'target_name': 'system_wrappers_unittests_run', |
| 74 'type': 'none', | 95 'type': 'none', |
| 75 'dependencies': [ | 96 'dependencies': [ |
| 76 'system_wrappers_unittests', | 97 'system_wrappers_unittests', |
| 77 ], | 98 ], |
| 78 'includes': [ | 99 'includes': [ |
| 79 '../build/isolate.gypi', | 100 '../build/isolate.gypi', |
| 80 ], | 101 ], |
| 81 'sources': [ | 102 'sources': [ |
| 82 'system_wrappers_unittests.isolate', | 103 'system_wrappers_unittests.isolate', |
| 83 ], | 104 ], |
| 84 }, | 105 }, |
| 85 ], | 106 ], |
| 86 }], | 107 }], |
| 87 ], | 108 ], |
| 88 } | 109 } |
| 89 | 110 |
| OLD | NEW |