Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(564)

Unified Diff: webrtc/modules/video_coding/BUILD.gn

Issue 1999723002: Fix iOS GN build and cleanup system_wrappers (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Renamed to atomic32_non_darwin_unix.cc due to _android suffix filtering Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/video_coding/BUILD.gn
diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn
index e0f26f365deda6e38f83282a8b6bbbf9887c1ab8..c18ae7152d3ad863ea89a6380b6de16333d692ae 100644
--- a/webrtc/modules/video_coding/BUILD.gn
+++ b/webrtc/modules/video_coding/BUILD.gn
@@ -151,6 +151,11 @@ source_set("webrtc_h264") {
"../../system_wrappers",
]
+ if (is_ios) {
+ sources += [ "codecs/h264/h264_objc.mm" ]
+ deps += [ ":webrtc_h264_video_toolbox" ]
+ }
+
if (rtc_use_h264) {
defines += [ "WEBRTC_USE_H264" ]
if (rtc_initialize_ffmpeg) {
@@ -170,8 +175,52 @@ source_set("webrtc_h264") {
}
}
-# TODO(tkchin): Source set for webrtc_h264_video_toolbox. Currently not
-# possible to add, see https://crbug.com/297668.
+if (is_ios) {
+ source_set("webrtc_h264_video_toolbox") {
+ sources = [
+ "codecs/h264/h264_video_toolbox_decoder.cc",
+ "codecs/h264/h264_video_toolbox_decoder.h",
+ "codecs/h264/h264_video_toolbox_encoder.cc",
+ "codecs/h264/h264_video_toolbox_encoder.h",
+ "codecs/h264/h264_video_toolbox_nalu.cc",
+ "codecs/h264/h264_video_toolbox_nalu.h",
+ ]
+
+ configs += [ "//build/config/compiler:enable_arc" ]
+
+ cflags = [ "-Wobjc-missing-property-synthesis" ]
+
+ precompiled_header = "../../sdk/objc/WebRTC-Prefix.pch"
+ precompiled_source = "../../sdk/objc/WebRTC-Prefix.pch"
+
+ deps = [
+ "../../sdk:rtc_sdk_common_objc",
+ ]
+
+ libs = [
+ "CoreFoundation.framework",
+ "CoreMedia.framework",
+ "CoreVideo.framework",
+ "VideoToolbox.framework",
+ ]
+
+ if (is_clang) {
+ # Suppress warnings from Chrome's Clang plugins.
+ # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
+ configs -= [ "//build/config/clang:find_bad_constructs" ]
+ }
+
+ if (rtc_build_libyuv) {
+ deps += [ "$rtc_libyuv_dir" ]
+ public_deps = [
+ "$rtc_libyuv_dir",
+ ]
+ } else {
+ # Need to add a directory normally exported by libyuv.
+ include_dirs += [ "$rtc_libyuv_dir/include" ]
+ }
+ }
+}
source_set("webrtc_i420") {
sources = [
« no previous file with comments | « webrtc/modules/utility/BUILD.gn ('k') | webrtc/sdk/BUILD.gn » ('j') | webrtc/sdk/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698