OLD | NEW |
---|---|
1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
153 '../../webrtc_overrides', | 153 '../../webrtc_overrides', |
154 ], | 154 ], |
155 'sources': [ | 155 'sources': [ |
156 '../../webrtc_overrides/webrtc/base/logging.cc', | 156 '../../webrtc_overrides/webrtc/base/logging.cc', |
157 '../../webrtc_overrides/webrtc/base/logging.h', | 157 '../../webrtc_overrides/webrtc/base/logging.h', |
158 ], | 158 ], |
159 }, { | 159 }, { |
160 'sources': [ | 160 'sources': [ |
161 'logging.cc', | 161 'logging.cc', |
162 'logging.h', | 162 'logging.h', |
163 'logging_mac.mm', | |
163 ], | 164 ], |
164 }], | 165 }], |
166 ['OS=="mac" and build_with_chromium==0', { | |
167 'all_dependent_settings': { | |
168 'xcode_settings': { | |
169 'OTHER_LDFLAGS': [ | |
170 # needed for logging_mac.mm | |
171 '-framework Foundation', | |
kjellander_webrtc
2016/04/25 04:47:43
I'm missing a corresponding public_deps entry for
kjellander_webrtc
2016/04/25 05:42:37
Done in https://codereview.webrtc.org/1921513002/
| |
172 ], | |
173 }, | |
174 }, | |
175 }], # OS=="mac" and build_with_chromium==0 | |
165 ], | 176 ], |
166 }, | 177 }, |
167 { | 178 { |
168 'target_name': 'rtc_base', | 179 'target_name': 'rtc_base', |
169 'type': 'static_library', | 180 'type': 'static_library', |
170 'dependencies': [ | 181 'dependencies': [ |
171 '<(webrtc_root)/common.gyp:webrtc_common', | 182 '<(webrtc_root)/common.gyp:webrtc_common', |
172 'rtc_base_approved', | 183 'rtc_base_approved', |
173 ], | 184 ], |
174 'export_dependent_settings': [ | 185 'export_dependent_settings': [ |
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
646 }, | 657 }, |
647 { | 658 { |
648 'target_name': 'gtest_prod', | 659 'target_name': 'gtest_prod', |
649 'type': 'static_library', | 660 'type': 'static_library', |
650 'sources': [ | 661 'sources': [ |
651 'gtest_prod_util.h', | 662 'gtest_prod_util.h', |
652 ], | 663 ], |
653 }, | 664 }, |
654 ], | 665 ], |
655 } | 666 } |
OLD | NEW |