commit eec86cdd96dfae362df9d37eedeee13604fd81f3
author Oleh Prypin <oprypin@webrtc.org> Mon Jul 08 07:47:41 2019
committer Commit Bot <commit-bot@chromium.org> Mon Jul 08 11:21:30 2019
tree 62faa2427ce687d40b3e7d8374a7a674438ff6d8
parent 86f8b3bd5d29e790ae24e0c285fa501805529d62

Fix platform-specific header dependencies to be more precise

Make the GN conditionals match what happens in sources, or the other way around. Include headers only when they're used.

Bug: None
Change-Id: Ib8e3346e3c24eaa7e61ac4776dcd66efe2cc5c65
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144880
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28500}

examples/objc/AppRTCMobile/ios/ARDVideoCallView.m

diff --git a/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m b/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m
index a29f2cf..60b78c7 100644
--- a/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m
+++ b/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m
@@ -13,7 +13,9 @@
 #import <AVFoundation/AVFoundation.h>
 
 #import <WebRTC/RTCEAGLVideoView.h>
+#if defined(RTC_SUPPORTS_METAL)
 #import <WebRTC/RTCMTLVideoView.h>
+#endif
 
 #import "UIImage+ARDUtilities.h"
 

modules/audio_processing/BUILD.gn

diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index 81dc2be..488099a 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -302,7 +302,9 @@
 
 rtc_source_set("audio_processing_c") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
-  sources = []
+  sources = [
+    "ns/windows_private.h",
+  ]
 
   if (rtc_prefer_fixed_point) {
     sources += [
@@ -324,7 +326,6 @@
       "ns/noise_suppression.h",
       "ns/ns_core.c",
       "ns/ns_core.h",
-      "ns/windows_private.h",
     ]
   }
 

modules/video_processing/util/denoiser_filter.cc

diff --git a/modules/video_processing/util/denoiser_filter.cc b/modules/video_processing/util/denoiser_filter.cc
index a88865b..916afcd 100644
--- a/modules/video_processing/util/denoiser_filter.cc
+++ b/modules/video_processing/util/denoiser_filter.cc
@@ -10,12 +10,16 @@
 
 #include "modules/video_processing/util/denoiser_filter.h"
 #include "modules/video_processing/util/denoiser_filter_c.h"
-#include "modules/video_processing/util/denoiser_filter_neon.h"
-#include "modules/video_processing/util/denoiser_filter_sse2.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/system/arch.h"
 #include "system_wrappers/include/cpu_features_wrapper.h"
 
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+#include "modules/video_processing/util/denoiser_filter_sse2.h"
+#elif defined(WEBRTC_HAS_NEON)
+#include "modules/video_processing/util/denoiser_filter_neon.h"
+#endif
+
 namespace webrtc {
 
 const int kMotionMagnitudeThreshold = 8 * 3;

test/testsupport/file_utils.cc

diff --git a/test/testsupport/file_utils.cc b/test/testsupport/file_utils.cc
index b3ef0eb..96bd495 100644
--- a/test/testsupport/file_utils.cc
+++ b/test/testsupport/file_utils.cc
@@ -48,9 +48,7 @@
 
 #if defined(WEBRTC_IOS)
 #include "test/testsupport/ios_file_utils.h"
-#endif
-
-#if defined(WEBRTC_MAC)
+#elif defined(WEBRTC_MAC)
 #include "test/testsupport/mac_file_utils.h"
 #endif