Per Kjellander a0f5f60c93 Revert "Revert "Make some more targets publicly visible""
This reverts commit 55d1809d0d73592a1ddf4f0fb02ce7444fa066aa.

Reason for revert: This cl was not the culprit for breaking chrome content/renderer deps.

Original change's description:
> Revert "Make some more targets publicly visible"
> 
> This reverts commit 60d179256213c7516808aff827637cab8a47de89.
> 
> Reason for revert: 
> 
> Breaks Chrome FYI:
> 
> /b/c/b/Linux_Builder/src/buildtools/linux64/gn gen //out/Release --check
>   -> returned 1
> ERROR at //build/split_static_library.gni:12:5: Dependency not allowed.
>     static_library(target_name) {
>     ^----------------------------
> The item //content/renderer:renderer
> can not depend on //third_party/webrtc/media:rtc_internal_video_codecs
> because it is not in //third_party/webrtc/media:rtc_internal_video_codecs's visibility list: [
>   //third_party/webrtc/*
>   //third_party/webrtc_overrides/*
> ]
> 
>  https://logs.chromium.org/v/?s=chromium%2Fbb%2Fchromium.webrtc.fyi%2FLinux_Builder%2F23560%2F%2B%2Frecipes%2Fsteps%2Fgenerate_build_files%2F0%2Fstdout
> 
> Original change's description:
> > Make some more targets publicly visible
> > 
> > To fix build errors introduced by
> > https://webrtc-review.googlesource.com/c/src/+/24140
> > 
> > BUG=webrtc:8254
> > NOTRY=true
> > 
> > Change-Id: I9cdf9cee39735368af78291134dbad70aebb7195
> > Reviewed-on: https://webrtc-review.googlesource.com/38660
> > Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
> > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#21552}
> 
> TBR=mbonadei@webrtc.org,kwiberg@webrtc.org
> 
> Change-Id: I475ac382218fa77d33abc595f0773275d715a28e
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:8254
> Reviewed-on: https://webrtc-review.googlesource.com/38740
> Reviewed-by: Per Kjellander <perkj@webrtc.org>
> Commit-Queue: Per Kjellander <perkj@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#21554}

TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,perkj@webrtc.org

Change-Id: If8e9b7b1c934ec4b5ed61941c845e62e43bef97e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:8254
Reviewed-on: https://webrtc-review.googlesource.com/38841
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21559}
2018-01-10 15:57:43 +00:00

232 lines
6.4 KiB
Plaintext

# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
import("../../webrtc.gni")
# Note this target is missing an implementation for the video capture.
# Targets must link with either 'video_capture' or
# 'video_capture_internal_impl' depending on whether they want to
# use the internal capturer.
rtc_static_library("video_capture_module") {
visibility = [ "*" ]
sources = [
"device_info_impl.cc",
"device_info_impl.h",
"video_capture.h",
"video_capture_config.h",
"video_capture_defines.h",
"video_capture_factory.cc",
"video_capture_factory.h",
"video_capture_impl.cc",
"video_capture_impl.h",
]
deps = [
"..:module_api",
"../..:webrtc_common",
"../../:typedefs",
"../../api:libjingle_peerconnection_api",
"../../api:video_frame_api",
"../../api:video_frame_api_i420",
"../../common_video",
"../../media:rtc_media_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:stringutils",
"../../system_wrappers",
"//third_party/libyuv",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
rtc_static_library("video_capture") {
visibility = [ "*" ]
sources = [
"external/device_info_external.cc",
"external/video_capture_external.cc",
]
deps = [
":video_capture_module",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
if (!build_with_chromium) {
config("video_capture_internal_impl_config") {
if (is_ios || is_mac) {
libs = [
"AVFoundation.framework",
"CoreMedia.framework",
"CoreVideo.framework",
]
}
}
config("video_capture_internal_impl_warnings_config") {
if (is_win && is_clang) {
cflags = [
"-Wno-comment",
"-Wno-ignored-attributes",
# See https://bugs.chromium.org/p/webrtc/issues/detail?id=6269
# for -Wno-ignored-qualifiers
"-Wno-ignored-qualifiers",
"-Wno-microsoft-extra-qualification",
"-Wno-missing-braces",
"-Wno-overloaded-virtual",
"-Wno-reorder",
"-Wno-writable-strings",
]
}
}
if (is_ios || is_mac) {
rtc_source_set("video_capture_internal_impl_objc") {
visibility = [ ":video_capture_internal_impl" ]
configs += [ ":video_capture_internal_impl_warnings_config" ]
deps = [
":video_capture_module",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
]
sources = [
"objc/device_info.h",
"objc/device_info.mm",
"objc/device_info_objc.h",
"objc/device_info_objc.mm",
"objc/rtc_video_capture_objc.h",
"objc/rtc_video_capture_objc.mm",
"objc/video_capture.h",
"objc/video_capture.mm",
]
all_dependent_configs = [ ":video_capture_internal_impl_config" ]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
}
rtc_source_set("video_capture_internal_impl") {
configs += [ ":video_capture_internal_impl_warnings_config" ]
deps = [
":video_capture_module",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
]
if (is_linux) {
sources = [
"linux/device_info_linux.cc",
"linux/device_info_linux.h",
"linux/video_capture_linux.cc",
"linux/video_capture_linux.h",
]
deps += [
"../..:webrtc_common",
"../../media:rtc_media_base",
]
}
if (is_win) {
sources = [
"windows/device_info_ds.cc",
"windows/device_info_ds.h",
"windows/device_info_mf.cc",
"windows/device_info_mf.h",
"windows/help_functions_ds.cc",
"windows/help_functions_ds.h",
"windows/sink_filter_ds.cc",
"windows/sink_filter_ds.h",
"windows/video_capture_ds.cc",
"windows/video_capture_ds.h",
"windows/video_capture_factory_windows.cc",
"windows/video_capture_mf.cc",
"windows/video_capture_mf.h",
]
libs = [ "Strmiids.lib" ]
deps += [ "//third_party/winsdk_samples" ]
}
if (is_ios || is_mac) {
deps += [ ":video_capture_internal_impl_objc" ]
}
all_dependent_configs = [ ":video_capture_internal_impl_config" ]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
if (!is_android && rtc_include_tests) {
rtc_test("video_capture_tests") {
sources = [
"test/video_capture_unittest.cc",
]
cflags = []
if (is_linux || is_mac) {
cflags += [ "-Wno-write-strings" ]
}
ldflags = []
if (is_linux || is_mac) {
ldflags += [
"-lpthread",
"-lm",
]
}
if (is_linux) {
ldflags += [
"-lrt",
"-lXext",
"-lX11",
]
}
deps = [
":video_capture_internal_impl",
":video_capture_module",
"../../api:video_frame_api",
"../../api:video_frame_api_i420",
"../../common_video:common_video",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers",
"../../system_wrappers:system_wrappers_default",
"../../test:video_test_common",
"../utility",
"//testing/gtest",
]
deps += [ "../../test:test_main" ]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
}
}