| 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 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. |
| 10 | 10 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 if (rtc_have_dbus_glib) { | 77 if (rtc_have_dbus_glib) { |
| 78 defines += [ "HAVE_DBUS_GLIB" ] | 78 defines += [ "HAVE_DBUS_GLIB" ] |
| 79 | 79 |
| 80 # TODO(kjellander): Investigate this, it seems like include <dbus/dbus.h> | 80 # TODO(kjellander): Investigate this, it seems like include <dbus/dbus.h> |
| 81 # is still not found even if the execution of | 81 # is still not found even if the execution of |
| 82 # build/config/linux/pkg-config.py dbus-glib-1 returns correct include | 82 # build/config/linux/pkg-config.py dbus-glib-1 returns correct include |
| 83 # dirs on Linux. | 83 # dirs on Linux. |
| 84 all_dependent_configs = [ "dbus-glib" ] | 84 all_dependent_configs = [ "dbus-glib" ] |
| 85 } | 85 } |
| 86 | 86 |
| 87 if (rtc_relative_path) { | |
| 88 defines += [ "EXPAT_RELATIVE_PATH" ] | |
| 89 } | |
| 90 | |
| 91 if (build_with_chromium) { | 87 if (build_with_chromium) { |
| 92 defines += [ "LOGGING_INSIDE_WEBRTC" ] | 88 defines += [ "LOGGING_INSIDE_WEBRTC" ] |
| 93 } else { | 89 } else { |
| 94 if (is_posix) { | 90 if (is_posix) { |
| 95 # -Wextra is currently disabled in Chromium"s common.gypi. Enable | 91 # -Wextra is currently disabled in Chromium"s common.gypi. Enable |
| 96 # for targets that can handle it. For Android/arm64 right now | 92 # for targets that can handle it. For Android/arm64 right now |
| 97 # there will be an "enumeral and non-enumeral type in conditional | 93 # there will be an "enumeral and non-enumeral type in conditional |
| 98 # expression" warning in android_tools/ndk_experimental"s version | 94 # expression" warning in android_tools/ndk_experimental"s version |
| 99 # of stlport. | 95 # of stlport. |
| 100 # See: https://code.google.com/p/chromium/issues/detail?id=379699 | 96 # See: https://code.google.com/p/chromium/issues/detail?id=379699 |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 "config.h", | 175 "config.h", |
| 180 "transport.h", | 176 "transport.h", |
| 181 ] | 177 ] |
| 182 | 178 |
| 183 defines = [] | 179 defines = [] |
| 184 configs += [ ":common_config" ] | 180 configs += [ ":common_config" ] |
| 185 public_configs = [ ":common_inherited_config" ] | 181 public_configs = [ ":common_inherited_config" ] |
| 186 | 182 |
| 187 deps = [ | 183 deps = [ |
| 188 ":webrtc_common", | 184 ":webrtc_common", |
| 189 "api", | |
| 190 "audio", | 185 "audio", |
| 191 "base:rtc_base", | 186 "base:rtc_base", |
| 192 "call", | 187 "call", |
| 193 "common_audio", | 188 "common_audio", |
| 194 "common_video", | 189 "common_video", |
| 195 "media", | |
| 196 "modules/audio_coding", | 190 "modules/audio_coding", |
| 197 "modules/audio_conference_mixer", | 191 "modules/audio_conference_mixer", |
| 198 "modules/audio_device", | 192 "modules/audio_device", |
| 199 "modules/audio_processing", | 193 "modules/audio_processing", |
| 200 "modules/bitrate_controller", | 194 "modules/bitrate_controller", |
| 201 "modules/desktop_capture", | 195 "modules/desktop_capture", |
| 202 "modules/media_file", | 196 "modules/media_file", |
| 203 "modules/rtp_rtcp", | 197 "modules/rtp_rtcp", |
| 204 "modules/utility", | 198 "modules/utility", |
| 205 "modules/video_coding", | 199 "modules/video_coding", |
| 206 "modules/video_processing", | 200 "modules/video_processing", |
| 207 "p2p", | |
| 208 "pc", | |
| 209 "system_wrappers", | 201 "system_wrappers", |
| 210 "tools", | 202 "tools", |
| 211 "video", | 203 "video", |
| 212 "voice_engine", | 204 "voice_engine", |
| 213 ] | 205 ] |
| 214 | 206 |
| 215 if (build_with_chromium) { | 207 if (build_with_chromium) { |
| 216 deps += [ "modules/video_capture" ] | 208 deps += [ "modules/video_capture" ] |
| 217 } | 209 } |
| 218 | 210 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 if (use_libfuzzer || use_drfuzz) { | 308 if (use_libfuzzer || use_drfuzz) { |
| 317 # This target is only here for gn to discover fuzzer build targets under | 309 # This target is only here for gn to discover fuzzer build targets under |
| 318 # webrtc/test/fuzzers/. | 310 # webrtc/test/fuzzers/. |
| 319 group("webrtc_fuzzers_dummy") { | 311 group("webrtc_fuzzers_dummy") { |
| 320 testonly = true | 312 testonly = true |
| 321 deps = [ | 313 deps = [ |
| 322 "test/fuzzers:webrtc_fuzzer_main", | 314 "test/fuzzers:webrtc_fuzzer_main", |
| 323 ] | 315 ] |
| 324 } | 316 } |
| 325 } | 317 } |
| OLD | NEW |