From e5dc3cefabd29cd68e42bb1017e1d899a8965988 Mon Sep 17 00:00:00 2001
From: mbonadei <mbonadei@webrtc.org>
Date: Wed, 25 Jan 2017 05:34:46 -0800
Subject: [PATCH] Fixing cross-compiling issues on android arm

BUG=webrtc:7042

Review-Url: https://codereview.webrtc.org/2647293006
Cr-Commit-Position: refs/heads/master@{#16265}
---
 webrtc/modules/audio_coding/BUILD.gn     | 9 ++++++++-
 webrtc/modules/audio_processing/BUILD.gn | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index 404637357d..b67a0192ec 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -708,6 +708,10 @@ rtc_source_set("isac_fix_c") {
     "../../system_wrappers",
   ]
 
+  if (rtc_build_with_neon) {
+    deps += [ ":isac_neon" ]
+  }
+
   if (current_cpu == "arm" && arm_version >= 7) {
     sources += [
       "codecs/isac/fix/source/lattice_armv7.S",
@@ -746,6 +750,10 @@ rtc_source_set("isac_fix_c") {
 
 if (rtc_build_with_neon) {
   rtc_static_library("isac_neon") {
+    # TODO(mbonadei): Remove (bugs.webrtc.org/6828)
+    # Errors on cyclic dependency with :isac_fix_c if enabled.
+    check_includes = false
+
     sources = [
       "codecs/isac/fix/source/entropy_coding_neon.c",
       "codecs/isac/fix/source/filterbanks_neon.c",
@@ -772,7 +780,6 @@ if (rtc_build_with_neon) {
     }
 
     deps = [
-      ":isac_fix_c",
       "../../base:rtc_base_approved",
       "../../common_audio",
     ]
diff --git a/webrtc/modules/audio_processing/BUILD.gn b/webrtc/modules/audio_processing/BUILD.gn
index 87501f4cdb..4dcf7d90d1 100644
--- a/webrtc/modules/audio_processing/BUILD.gn
+++ b/webrtc/modules/audio_processing/BUILD.gn
@@ -284,6 +284,10 @@ rtc_source_set("audio_processing_c") {
     "../../common_audio",
     "../../system_wrappers",
   ]
+
+  if (rtc_build_with_neon) {
+    deps += [ ":audio_processing_neon_c" ]
+  }
 }
 
 if (rtc_enable_protobuf) {
@@ -365,6 +369,10 @@ if (rtc_build_with_neon) {
   }
 
   rtc_static_library("audio_processing_neon_c") {
+    # TODO(mbonadei): Remove (bugs.webrtc.org/6828)
+    # Errors on cyclic dependency with :audio_processing_c if enabled.
+    check_includes = false
+
     sources = [
       "ns/nsx_core_neon.c",
     ]
@@ -386,7 +394,6 @@ if (rtc_build_with_neon) {
       ]
     }
     deps = [
-      ":audio_processing_c",
       "../../base:rtc_base_approved",
     ]
   }