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 import("//build/config/crypto.gni") | 9 import("//build/config/crypto.gni") |
10 import("//build/config/ui.gni") | 10 import("//build/config/ui.gni") |
(...skipping 13 matching lines...) Expand all Loading... | |
24 ":rtc_base_approved", | 24 ":rtc_base_approved", |
25 ":rtc_task_queue", | 25 ":rtc_task_queue", |
26 ":sequenced_task_checker", | 26 ":sequenced_task_checker", |
27 ":weak_ptr", | 27 ":weak_ptr", |
28 ] | 28 ] |
29 if (is_android) { | 29 if (is_android) { |
30 public_deps += [ ":base_java" ] | 30 public_deps += [ ":base_java" ] |
31 } | 31 } |
32 } | 32 } |
33 | 33 |
34 config("rtc_base_approved_all_dependent_config") { | |
35 if (is_mac && !build_with_chromium) { | |
36 libs = [ "Foundation.framework" ] # needed for logging_mac.mm | |
37 } | |
38 } | |
39 | |
40 config("rtc_base_chromium_config") { | 34 config("rtc_base_chromium_config") { |
41 defines = [ "NO_MAIN_THREAD_WRAPPING" ] | 35 defines = [ "NO_MAIN_THREAD_WRAPPING" ] |
42 } | 36 } |
43 | 37 |
44 config("rtc_base_all_dependent_config") { | 38 config("rtc_base_all_dependent_config") { |
45 if (is_ios) { | 39 if (is_ios) { |
46 libs = [ | 40 libs = [ |
47 "CFNetwork.framework", | 41 "CFNetwork.framework", |
48 "Security.framework", | 42 "Security.framework", |
49 "SystemConfiguration.framework", | 43 "SystemConfiguration.framework", |
(...skipping 29 matching lines...) Expand all Loading... | |
79 ] | 73 ] |
80 } | 74 } |
81 } | 75 } |
82 | 76 |
83 source_set("compile_assert_c") { | 77 source_set("compile_assert_c") { |
84 sources = [ | 78 sources = [ |
85 "compile_assert_c.h", | 79 "compile_assert_c.h", |
86 ] | 80 ] |
87 } | 81 } |
88 | 82 |
83 rtc_static_library("rtc_base_approved") { | |
kwiberg-webrtc
2017/08/31 20:57:02
If you make this a source set, can you drop the no
mbonadei
2017/09/01 09:46:38
Yes, done.
| |
84 sources = [ | |
85 "noop.cc", | |
86 ] | |
87 if (is_mac && !build_with_chromium) { | |
88 public_deps = [ | |
89 ":rtc_base_approved_objc", | |
90 ] | |
91 } else { | |
92 public_deps = [ | |
93 ":rtc_base_approved_generic", | |
94 ] | |
kwiberg-webrtc
2017/08/31 20:57:02
Can you make this public_dep unconditional, and tu
mbonadei
2017/09/01 09:46:38
Done.
| |
95 } | |
96 } | |
97 | |
89 # The subset of rtc_base approved for use outside of libjingle. | 98 # The subset of rtc_base approved for use outside of libjingle. |
90 rtc_static_library("rtc_base_approved") { | 99 rtc_static_library("rtc_base_approved_generic") { |
91 # TODO(kjellander): Remove (bugs.webrtc.org/7480) | 100 # TODO(kjellander): Remove (bugs.webrtc.org/7480) |
92 # Enabling GN check triggers a cyclic dependency caused by rate_limiter.cc: | 101 # Enabling GN check triggers a cyclic dependency caused by rate_limiter.cc: |
93 # :rtc_base_approved -> ../system_wrappers -> :rtc_base_approved | 102 # :rtc_base_approved -> ../system_wrappers -> :rtc_base_approved |
103 visibility = [ ":*" ] | |
kwiberg-webrtc
2017/08/31 20:57:03
Could you tighten the visibility restrictions here
mbonadei
2017/09/01 09:46:38
Yes, I remember I talked about this with kjellande
kjellander_webrtc
2017/09/01 10:11:20
It's just laziness, I wouldn't say we prefer one o
| |
94 check_includes = false | 104 check_includes = false |
95 defines = [] | 105 defines = [] |
96 libs = [] | 106 libs = [] |
97 deps = [] | 107 deps = [] |
98 all_dependent_configs = [ ":rtc_base_approved_all_dependent_config" ] | |
99 | 108 |
100 sources = [ | 109 sources = [ |
101 "array_view.h", | 110 "array_view.h", |
102 "arraysize.h", | 111 "arraysize.h", |
103 "atomicops.h", | 112 "atomicops.h", |
104 "base64.cc", | 113 "base64.cc", |
105 "base64.h", | 114 "base64.h", |
106 "basictypes.h", | 115 "basictypes.h", |
107 "bind.h", | 116 "bind.h", |
108 "bitbuffer.cc", | 117 "bitbuffer.cc", |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
203 # Dependency on chromium's logging (in //base). | 212 # Dependency on chromium's logging (in //base). |
204 deps += [ "//base:base" ] | 213 deps += [ "//base:base" ] |
205 sources += [ | 214 sources += [ |
206 "../../webrtc_overrides/webrtc/rtc_base/logging.cc", | 215 "../../webrtc_overrides/webrtc/rtc_base/logging.cc", |
207 "../../webrtc_overrides/webrtc/rtc_base/logging.h", | 216 "../../webrtc_overrides/webrtc/rtc_base/logging.h", |
208 ] | 217 ] |
209 } else { | 218 } else { |
210 sources += [ | 219 sources += [ |
211 "logging.cc", | 220 "logging.cc", |
212 "logging.h", | 221 "logging.h", |
213 "logging_mac.mm", | |
214 ] | 222 ] |
215 } | 223 } |
216 if (is_component_build && is_win) { | 224 if (is_component_build && is_win) { |
217 # Copy the VS runtime DLLs into the isolate so that they don't have to be | 225 # Copy the VS runtime DLLs into the isolate so that they don't have to be |
218 # preinstalled on the target machine. The debug runtimes have a "d" at | 226 # preinstalled on the target machine. The debug runtimes have a "d" at |
219 # the end. | 227 # the end. |
220 # This is a copy of https://codereview.chromium.org/1783973002. | 228 # This is a copy of https://codereview.chromium.org/1783973002. |
221 # TODO(ehmaldonado): We'd like Chromium to make this changes easier to use, | 229 # TODO(ehmaldonado): We'd like Chromium to make this changes easier to use, |
222 # so we don't have to copy their changes and risk breakages. | 230 # so we don't have to copy their changes and risk breakages. |
223 # See http://crbug.com/653569 | 231 # See http://crbug.com/653569 |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
283 } else { | 291 } else { |
284 data += [ "$clang_base_path/lib/clang/$clang_version/lib/windows/clang_r t.asan_dynamic-i386.dll" ] | 292 data += [ "$clang_base_path/lib/clang/$clang_version/lib/windows/clang_r t.asan_dynamic-i386.dll" ] |
285 } | 293 } |
286 } | 294 } |
287 } | 295 } |
288 if (is_nacl) { | 296 if (is_nacl) { |
289 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] | 297 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] |
290 } | 298 } |
291 } | 299 } |
292 | 300 |
301 if (is_mac && !build_with_chromium) { | |
302 config("rtc_base_approved_objc_all_dependent_config") { | |
303 visibility = [ ":*" ] | |
304 libs = [ "Foundation.framework" ] # needed for logging_mac.mm | |
305 } | |
306 | |
307 rtc_static_library("rtc_base_approved_objc") { | |
308 visibility = [ ":*" ] | |
309 all_dependent_configs = [ ":rtc_base_approved_objc_all_dependent_config" ] | |
310 sources = [ | |
311 "logging_mac.mm", | |
312 ] | |
313 public_deps = [ | |
314 ":rtc_base_approved_generic", | |
315 ] | |
316 } | |
317 } | |
318 | |
293 config("enable_libevent_config") { | 319 config("enable_libevent_config") { |
294 defines = [ "WEBRTC_BUILD_LIBEVENT" ] | 320 defines = [ "WEBRTC_BUILD_LIBEVENT" ] |
295 } | 321 } |
296 | 322 |
297 rtc_static_library("rtc_task_queue") { | 323 rtc_static_library("rtc_task_queue") { |
298 public_deps = [ | 324 public_deps = [ |
299 ":rtc_base_approved", | 325 ":rtc_base_approved", |
300 ] | 326 ] |
301 | 327 |
302 if (build_with_chromium) { | 328 if (build_with_chromium) { |
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1031 if (is_android) { | 1057 if (is_android) { |
1032 android_library("base_java") { | 1058 android_library("base_java") { |
1033 java_files = [ | 1059 java_files = [ |
1034 "java/src/org/webrtc/ContextUtils.java", | 1060 "java/src/org/webrtc/ContextUtils.java", |
1035 "java/src/org/webrtc/Logging.java", | 1061 "java/src/org/webrtc/Logging.java", |
1036 "java/src/org/webrtc/Size.java", | 1062 "java/src/org/webrtc/Size.java", |
1037 "java/src/org/webrtc/ThreadUtils.java", | 1063 "java/src/org/webrtc/ThreadUtils.java", |
1038 ] | 1064 ] |
1039 } | 1065 } |
1040 } | 1066 } |
OLD | NEW |