From 6d3c57300b8399355e054565f285719e888bd452 Mon Sep 17 00:00:00 2001 From: mbonadei Date: Tue, 27 Dec 2016 06:32:08 -0800 Subject: [PATCH] Reland "Refactor webrtc/modules/video_processing for GN check" This reverts commit d39e16ac300d7947d22b953898aaef073e553ad3. This will fix the missing dependency which was causing the failure of many buildbots. BUG=webrtc:6828 NOTRY=True Review-Url: https://codereview.webrtc.org/2597643002 Cr-Commit-Position: refs/heads/master@{#15805} --- .gn | 1 + webrtc/modules/video_processing/BUILD.gn | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/.gn b/.gn index 14478cae2a..155e4a27de 100644 --- a/.gn +++ b/.gn @@ -35,6 +35,7 @@ check_targets = [ "//webrtc/modules/utility/*", "//webrtc/modules/video_capture/*", "//webrtc/modules/video_coding/*", + "//webrtc/modules/video_processing/*", "//webrtc/stats:rtc_stats", "//webrtc/voice_engine", "//webrtc/voice_engine:level_indicator", diff --git a/webrtc/modules/video_processing/BUILD.gn b/webrtc/modules/video_processing/BUILD.gn index b1ab8ecc5e..5ab3f457ec 100644 --- a/webrtc/modules/video_processing/BUILD.gn +++ b/webrtc/modules/video_processing/BUILD.gn @@ -26,6 +26,7 @@ rtc_static_library("video_processing") { ] deps = [ + "../../base:rtc_base_approved", "../../common_audio", "../../common_video", "../../modules/utility", @@ -46,11 +47,20 @@ rtc_static_library("video_processing") { if (build_video_processing_sse2) { rtc_static_library("video_processing_sse2") { + # TODO(mbonadei): Remove (bugs.webrtc.org/6828) + # Errors on cyclic dependency with :video_processing if enabled. + check_includes = false + sources = [ "util/denoiser_filter_sse2.cc", "util/denoiser_filter_sse2.h", ] + deps = [ + "../../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" ] @@ -64,10 +74,15 @@ if (build_video_processing_sse2) { if (rtc_build_with_neon) { rtc_static_library("video_processing_neon") { + # TODO(mbonadei): Remove (bugs.webrtc.org/6828) + # Errors on cyclic dependency with :video_processing if enabled. + check_includes = false + sources = [ "util/denoiser_filter_neon.cc", "util/denoiser_filter_neon.h", ] + if (current_cpu != "arm64") { suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ] cflags = [ "-mfpu=neon" ]