Update makefiles after merge of Chromium at 277428
This commit was generated by merge_from_chromium.py.
Change-Id: I35c59b36614d836accbb543178393a6c061586f1
diff --git a/base/webrtc_base.target.darwin-arm.mk b/base/webrtc_base.target.darwin-arm.mk
index b511c94..72b07fd 100644
--- a/base/webrtc_base.target.darwin-arm.mk
+++ b/base/webrtc_base.target.darwin-arm.mk
@@ -198,6 +198,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -323,6 +324,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/base/webrtc_base.target.darwin-arm64.mk b/base/webrtc_base.target.darwin-arm64.mk
index c70b25e..49da506 100644
--- a/base/webrtc_base.target.darwin-arm64.mk
+++ b/base/webrtc_base.target.darwin-arm64.mk
@@ -185,6 +185,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -296,6 +297,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/base/webrtc_base.target.darwin-mips.mk b/base/webrtc_base.target.darwin-mips.mk
index bcf7022..524d924 100644
--- a/base/webrtc_base.target.darwin-mips.mk
+++ b/base/webrtc_base.target.darwin-mips.mk
@@ -192,6 +192,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -311,6 +312,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/base/webrtc_base.target.darwin-x86.mk b/base/webrtc_base.target.darwin-x86.mk
index 64b29bf..7c3e0c8 100644
--- a/base/webrtc_base.target.darwin-x86.mk
+++ b/base/webrtc_base.target.darwin-x86.mk
@@ -190,6 +190,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -306,6 +307,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/base/webrtc_base.target.darwin-x86_64.mk b/base/webrtc_base.target.darwin-x86_64.mk
index 7b3b0f9..4bef0ea 100644
--- a/base/webrtc_base.target.darwin-x86_64.mk
+++ b/base/webrtc_base.target.darwin-x86_64.mk
@@ -189,6 +189,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -305,6 +306,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/base/webrtc_base.target.linux-arm.mk b/base/webrtc_base.target.linux-arm.mk
index b511c94..72b07fd 100644
--- a/base/webrtc_base.target.linux-arm.mk
+++ b/base/webrtc_base.target.linux-arm.mk
@@ -198,6 +198,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -323,6 +324,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/base/webrtc_base.target.linux-arm64.mk b/base/webrtc_base.target.linux-arm64.mk
index c70b25e..49da506 100644
--- a/base/webrtc_base.target.linux-arm64.mk
+++ b/base/webrtc_base.target.linux-arm64.mk
@@ -185,6 +185,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -296,6 +297,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/base/webrtc_base.target.linux-mips.mk b/base/webrtc_base.target.linux-mips.mk
index bcf7022..524d924 100644
--- a/base/webrtc_base.target.linux-mips.mk
+++ b/base/webrtc_base.target.linux-mips.mk
@@ -192,6 +192,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -311,6 +312,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/base/webrtc_base.target.linux-x86.mk b/base/webrtc_base.target.linux-x86.mk
index 64b29bf..7c3e0c8 100644
--- a/base/webrtc_base.target.linux-x86.mk
+++ b/base/webrtc_base.target.linux-x86.mk
@@ -190,6 +190,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -306,6 +307,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/base/webrtc_base.target.linux-x86_64.mk b/base/webrtc_base.target.linux-x86_64.mk
index 7b3b0f9..4bef0ea 100644
--- a/base/webrtc_base.target.linux-x86_64.mk
+++ b/base/webrtc_base.target.linux-x86_64.mk
@@ -189,6 +189,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -305,6 +306,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_audio/common_audio.target.darwin-arm.mk b/common_audio/common_audio.target.darwin-arm.mk
index e8d1c53..b1fbcb0 100644
--- a/common_audio/common_audio.target.darwin-arm.mk
+++ b/common_audio/common_audio.target.darwin-arm.mk
@@ -166,6 +166,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -284,6 +285,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_audio/common_audio.target.darwin-arm64.mk b/common_audio/common_audio.target.darwin-arm64.mk
index 4f200ef..9f28720 100644
--- a/common_audio/common_audio.target.darwin-arm64.mk
+++ b/common_audio/common_audio.target.darwin-arm64.mk
@@ -153,6 +153,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -257,6 +258,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_audio/common_audio.target.darwin-mips.mk b/common_audio/common_audio.target.darwin-mips.mk
index 833e73e..79968a3 100644
--- a/common_audio/common_audio.target.darwin-mips.mk
+++ b/common_audio/common_audio.target.darwin-mips.mk
@@ -164,6 +164,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -276,6 +277,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_audio/common_audio.target.darwin-x86.mk b/common_audio/common_audio.target.darwin-x86.mk
index 771c5d9..6446932 100644
--- a/common_audio/common_audio.target.darwin-x86.mk
+++ b/common_audio/common_audio.target.darwin-x86.mk
@@ -158,6 +158,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -267,6 +268,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_audio/common_audio.target.darwin-x86_64.mk b/common_audio/common_audio.target.darwin-x86_64.mk
index 04d8418..9f7a06e 100644
--- a/common_audio/common_audio.target.darwin-x86_64.mk
+++ b/common_audio/common_audio.target.darwin-x86_64.mk
@@ -157,6 +157,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -265,6 +266,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_audio/common_audio.target.linux-arm.mk b/common_audio/common_audio.target.linux-arm.mk
index e8d1c53..b1fbcb0 100644
--- a/common_audio/common_audio.target.linux-arm.mk
+++ b/common_audio/common_audio.target.linux-arm.mk
@@ -166,6 +166,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -284,6 +285,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_audio/common_audio.target.linux-arm64.mk b/common_audio/common_audio.target.linux-arm64.mk
index 4f200ef..9f28720 100644
--- a/common_audio/common_audio.target.linux-arm64.mk
+++ b/common_audio/common_audio.target.linux-arm64.mk
@@ -153,6 +153,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -257,6 +258,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_audio/common_audio.target.linux-mips.mk b/common_audio/common_audio.target.linux-mips.mk
index 833e73e..79968a3 100644
--- a/common_audio/common_audio.target.linux-mips.mk
+++ b/common_audio/common_audio.target.linux-mips.mk
@@ -164,6 +164,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -276,6 +277,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_audio/common_audio.target.linux-x86.mk b/common_audio/common_audio.target.linux-x86.mk
index 771c5d9..6446932 100644
--- a/common_audio/common_audio.target.linux-x86.mk
+++ b/common_audio/common_audio.target.linux-x86.mk
@@ -158,6 +158,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -267,6 +268,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_audio/common_audio.target.linux-x86_64.mk b/common_audio/common_audio.target.linux-x86_64.mk
index 04d8418..9f7a06e 100644
--- a/common_audio/common_audio.target.linux-x86_64.mk
+++ b/common_audio/common_audio.target.linux-x86_64.mk
@@ -157,6 +157,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -265,6 +266,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_audio/common_audio_neon.target.darwin-arm.mk b/common_audio/common_audio_neon.target.darwin-arm.mk
index c9bcafc..11d7488 100644
--- a/common_audio/common_audio_neon.target.darwin-arm.mk
+++ b/common_audio/common_audio_neon.target.darwin-arm.mk
@@ -129,6 +129,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -246,6 +247,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_audio/common_audio_neon.target.linux-arm.mk b/common_audio/common_audio_neon.target.linux-arm.mk
index c9bcafc..11d7488 100644
--- a/common_audio/common_audio_neon.target.linux-arm.mk
+++ b/common_audio/common_audio_neon.target.linux-arm.mk
@@ -129,6 +129,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -246,6 +247,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_audio/common_audio_sse2.target.darwin-x86.mk b/common_audio/common_audio_sse2.target.darwin-x86.mk
index 8a9b5dd..95860e5 100644
--- a/common_audio/common_audio_sse2.target.darwin-x86.mk
+++ b/common_audio/common_audio_sse2.target.darwin-x86.mk
@@ -116,6 +116,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -223,6 +224,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_audio/common_audio_sse2.target.darwin-x86_64.mk b/common_audio/common_audio_sse2.target.darwin-x86_64.mk
index 87dff9e..b326911 100644
--- a/common_audio/common_audio_sse2.target.darwin-x86_64.mk
+++ b/common_audio/common_audio_sse2.target.darwin-x86_64.mk
@@ -115,6 +115,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -221,6 +222,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_audio/common_audio_sse2.target.linux-x86.mk b/common_audio/common_audio_sse2.target.linux-x86.mk
index 8a9b5dd..95860e5 100644
--- a/common_audio/common_audio_sse2.target.linux-x86.mk
+++ b/common_audio/common_audio_sse2.target.linux-x86.mk
@@ -116,6 +116,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -223,6 +224,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_audio/common_audio_sse2.target.linux-x86_64.mk b/common_audio/common_audio_sse2.target.linux-x86_64.mk
index 87dff9e..b326911 100644
--- a/common_audio/common_audio_sse2.target.linux-x86_64.mk
+++ b/common_audio/common_audio_sse2.target.linux-x86_64.mk
@@ -115,6 +115,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -221,6 +222,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_video/common_video.target.darwin-arm.mk b/common_video/common_video.target.darwin-arm.mk
index bc5feb2..e4fcd4f 100644
--- a/common_video/common_video.target.darwin-arm.mk
+++ b/common_video/common_video.target.darwin-arm.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -247,6 +248,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_video/common_video.target.darwin-arm64.mk b/common_video/common_video.target.darwin-arm64.mk
index 89de590..67010e7 100644
--- a/common_video/common_video.target.darwin-arm64.mk
+++ b/common_video/common_video.target.darwin-arm64.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -220,6 +221,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_video/common_video.target.darwin-mips.mk b/common_video/common_video.target.darwin-mips.mk
index 7b8447f..9687ab4 100644
--- a/common_video/common_video.target.darwin-mips.mk
+++ b/common_video/common_video.target.darwin-mips.mk
@@ -120,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -235,6 +236,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_video/common_video.target.darwin-x86.mk b/common_video/common_video.target.darwin-x86.mk
index adbb325..ecd62f0 100644
--- a/common_video/common_video.target.darwin-x86.mk
+++ b/common_video/common_video.target.darwin-x86.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -230,6 +231,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_video/common_video.target.darwin-x86_64.mk b/common_video/common_video.target.darwin-x86_64.mk
index 5a97252..9f48d51 100644
--- a/common_video/common_video.target.darwin-x86_64.mk
+++ b/common_video/common_video.target.darwin-x86_64.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -228,6 +229,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_video/common_video.target.linux-arm.mk b/common_video/common_video.target.linux-arm.mk
index bc5feb2..e4fcd4f 100644
--- a/common_video/common_video.target.linux-arm.mk
+++ b/common_video/common_video.target.linux-arm.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -247,6 +248,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_video/common_video.target.linux-arm64.mk b/common_video/common_video.target.linux-arm64.mk
index 89de590..67010e7 100644
--- a/common_video/common_video.target.linux-arm64.mk
+++ b/common_video/common_video.target.linux-arm64.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -220,6 +221,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_video/common_video.target.linux-mips.mk b/common_video/common_video.target.linux-mips.mk
index 7b8447f..9687ab4 100644
--- a/common_video/common_video.target.linux-mips.mk
+++ b/common_video/common_video.target.linux-mips.mk
@@ -120,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -235,6 +236,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_video/common_video.target.linux-x86.mk b/common_video/common_video.target.linux-x86.mk
index adbb325..ecd62f0 100644
--- a/common_video/common_video.target.linux-x86.mk
+++ b/common_video/common_video.target.linux-x86.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -230,6 +231,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/common_video/common_video.target.linux-x86_64.mk b/common_video/common_video.target.linux-x86_64.mk
index 5a97252..9f48d51 100644
--- a/common_video/common_video.target.linux-x86_64.mk
+++ b/common_video/common_video.target.linux-x86_64.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -228,6 +229,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/CNG.target.darwin-arm.mk b/modules/CNG.target.darwin-arm.mk
index c8840ef..48b83dd 100644
--- a/modules/CNG.target.darwin-arm.mk
+++ b/modules/CNG.target.darwin-arm.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -250,6 +251,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/CNG.target.darwin-arm64.mk b/modules/CNG.target.darwin-arm64.mk
index b1a5542..5725310 100644
--- a/modules/CNG.target.darwin-arm64.mk
+++ b/modules/CNG.target.darwin-arm64.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -223,6 +224,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/CNG.target.darwin-mips.mk b/modules/CNG.target.darwin-mips.mk
index b78c635..ec0dcc7 100644
--- a/modules/CNG.target.darwin-mips.mk
+++ b/modules/CNG.target.darwin-mips.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -240,6 +241,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/CNG.target.darwin-x86.mk b/modules/CNG.target.darwin-x86.mk
index f330c16..b74118c 100644
--- a/modules/CNG.target.darwin-x86.mk
+++ b/modules/CNG.target.darwin-x86.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -233,6 +234,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/CNG.target.darwin-x86_64.mk b/modules/CNG.target.darwin-x86_64.mk
index 161cebd..04c7949 100644
--- a/modules/CNG.target.darwin-x86_64.mk
+++ b/modules/CNG.target.darwin-x86_64.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -231,6 +232,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/CNG.target.linux-arm.mk b/modules/CNG.target.linux-arm.mk
index c8840ef..48b83dd 100644
--- a/modules/CNG.target.linux-arm.mk
+++ b/modules/CNG.target.linux-arm.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -250,6 +251,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/CNG.target.linux-arm64.mk b/modules/CNG.target.linux-arm64.mk
index b1a5542..5725310 100644
--- a/modules/CNG.target.linux-arm64.mk
+++ b/modules/CNG.target.linux-arm64.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -223,6 +224,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/CNG.target.linux-mips.mk b/modules/CNG.target.linux-mips.mk
index b78c635..ec0dcc7 100644
--- a/modules/CNG.target.linux-mips.mk
+++ b/modules/CNG.target.linux-mips.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -240,6 +241,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/CNG.target.linux-x86.mk b/modules/CNG.target.linux-x86.mk
index f330c16..b74118c 100644
--- a/modules/CNG.target.linux-x86.mk
+++ b/modules/CNG.target.linux-x86.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -233,6 +234,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/CNG.target.linux-x86_64.mk b/modules/CNG.target.linux-x86_64.mk
index 161cebd..04c7949 100644
--- a/modules/CNG.target.linux-x86_64.mk
+++ b/modules/CNG.target.linux-x86_64.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -231,6 +232,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G711.target.darwin-arm.mk b/modules/G711.target.darwin-arm.mk
index f3231ec..e2be0f2 100644
--- a/modules/G711.target.darwin-arm.mk
+++ b/modules/G711.target.darwin-arm.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -247,6 +248,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G711.target.darwin-arm64.mk b/modules/G711.target.darwin-arm64.mk
index 3feb0ce..d3eff91 100644
--- a/modules/G711.target.darwin-arm64.mk
+++ b/modules/G711.target.darwin-arm64.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -220,6 +221,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G711.target.darwin-mips.mk b/modules/G711.target.darwin-mips.mk
index 91a20b3..6f636ce 100644
--- a/modules/G711.target.darwin-mips.mk
+++ b/modules/G711.target.darwin-mips.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -237,6 +238,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G711.target.darwin-x86.mk b/modules/G711.target.darwin-x86.mk
index c261d15..2a5336b 100644
--- a/modules/G711.target.darwin-x86.mk
+++ b/modules/G711.target.darwin-x86.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -230,6 +231,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G711.target.darwin-x86_64.mk b/modules/G711.target.darwin-x86_64.mk
index 0d04202..098100c 100644
--- a/modules/G711.target.darwin-x86_64.mk
+++ b/modules/G711.target.darwin-x86_64.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -228,6 +229,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G711.target.linux-arm.mk b/modules/G711.target.linux-arm.mk
index f3231ec..e2be0f2 100644
--- a/modules/G711.target.linux-arm.mk
+++ b/modules/G711.target.linux-arm.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -247,6 +248,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G711.target.linux-arm64.mk b/modules/G711.target.linux-arm64.mk
index 3feb0ce..d3eff91 100644
--- a/modules/G711.target.linux-arm64.mk
+++ b/modules/G711.target.linux-arm64.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -220,6 +221,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G711.target.linux-mips.mk b/modules/G711.target.linux-mips.mk
index 91a20b3..6f636ce 100644
--- a/modules/G711.target.linux-mips.mk
+++ b/modules/G711.target.linux-mips.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -237,6 +238,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G711.target.linux-x86.mk b/modules/G711.target.linux-x86.mk
index c261d15..2a5336b 100644
--- a/modules/G711.target.linux-x86.mk
+++ b/modules/G711.target.linux-x86.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -230,6 +231,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G711.target.linux-x86_64.mk b/modules/G711.target.linux-x86_64.mk
index 0d04202..098100c 100644
--- a/modules/G711.target.linux-x86_64.mk
+++ b/modules/G711.target.linux-x86_64.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -228,6 +229,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G722.target.darwin-arm.mk b/modules/G722.target.darwin-arm.mk
index 9657824..cc9fe2f 100644
--- a/modules/G722.target.darwin-arm.mk
+++ b/modules/G722.target.darwin-arm.mk
@@ -127,6 +127,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -248,6 +249,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G722.target.darwin-arm64.mk b/modules/G722.target.darwin-arm64.mk
index c3f2180..fbaf110 100644
--- a/modules/G722.target.darwin-arm64.mk
+++ b/modules/G722.target.darwin-arm64.mk
@@ -114,6 +114,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -221,6 +222,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G722.target.darwin-mips.mk b/modules/G722.target.darwin-mips.mk
index bfb08bd..9fb6a50 100644
--- a/modules/G722.target.darwin-mips.mk
+++ b/modules/G722.target.darwin-mips.mk
@@ -122,6 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -238,6 +239,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G722.target.darwin-x86.mk b/modules/G722.target.darwin-x86.mk
index 97e5c3e..242f640 100644
--- a/modules/G722.target.darwin-x86.mk
+++ b/modules/G722.target.darwin-x86.mk
@@ -119,6 +119,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -231,6 +232,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G722.target.darwin-x86_64.mk b/modules/G722.target.darwin-x86_64.mk
index c89ffc6..8f71ab5 100644
--- a/modules/G722.target.darwin-x86_64.mk
+++ b/modules/G722.target.darwin-x86_64.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -229,6 +230,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G722.target.linux-arm.mk b/modules/G722.target.linux-arm.mk
index 9657824..cc9fe2f 100644
--- a/modules/G722.target.linux-arm.mk
+++ b/modules/G722.target.linux-arm.mk
@@ -127,6 +127,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -248,6 +249,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G722.target.linux-arm64.mk b/modules/G722.target.linux-arm64.mk
index c3f2180..fbaf110 100644
--- a/modules/G722.target.linux-arm64.mk
+++ b/modules/G722.target.linux-arm64.mk
@@ -114,6 +114,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -221,6 +222,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G722.target.linux-mips.mk b/modules/G722.target.linux-mips.mk
index bfb08bd..9fb6a50 100644
--- a/modules/G722.target.linux-mips.mk
+++ b/modules/G722.target.linux-mips.mk
@@ -122,6 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -238,6 +239,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G722.target.linux-x86.mk b/modules/G722.target.linux-x86.mk
index 97e5c3e..242f640 100644
--- a/modules/G722.target.linux-x86.mk
+++ b/modules/G722.target.linux-x86.mk
@@ -119,6 +119,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -231,6 +232,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/G722.target.linux-x86_64.mk b/modules/G722.target.linux-x86_64.mk
index c89ffc6..8f71ab5 100644
--- a/modules/G722.target.linux-x86_64.mk
+++ b/modules/G722.target.linux-x86_64.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -229,6 +230,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/NetEq4.target.linux-arm.mk b/modules/NetEq4.target.linux-arm.mk
deleted file mode 100644
index 96e5b55..0000000
--- a/modules/NetEq4.target.linux-arm.mk
+++ /dev/null
@@ -1,393 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
- third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/merge.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \
- third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \
- third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \
- third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \
- third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
- -fstack-protector \
- --param=ssp-buffer-size=4 \
- -Werror \
- -fno-exceptions \
- -fno-strict-aliasing \
- -Wall \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -fvisibility=hidden \
- -pipe \
- -fPIC \
- -Wno-unused-local-typedefs \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -fno-tree-sra \
- -fno-partial-inlining \
- -fno-early-inlining \
- -fno-tree-copy-prop \
- -fno-tree-loop-optimize \
- -fno-move-loop-invariants \
- -fno-caller-saves \
- -Wno-psabi \
- -ffunction-sections \
- -funwind-tables \
- -g \
- -fstack-protector \
- -fno-short-enums \
- -finline-limit=64 \
- -Wa,--noexecstack \
- -U_FORTIFY_SOURCE \
- -Wno-extra \
- -Wno-ignored-qualifiers \
- -Wno-type-limits \
- -Wno-unused-but-set-variable \
- -Os \
- -g \
- -fomit-frame-pointer \
- -fdata-sections \
- -ffunction-sections \
- -funwind-tables
-
-MY_DEFS_Debug := \
- '-DV8_DEPRECATION_WARNINGS' \
- '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
- '-D_FILE_OFFSET_BITS=64' \
- '-DNO_TCMALLOC' \
- '-DDISABLE_NACL' \
- '-DCHROMIUM_BUILD' \
- '-DUSE_LIBJPEG_TURBO=1' \
- '-DENABLE_WEBRTC=1' \
- '-DUSE_PROPRIETARY_CODECS' \
- '-DENABLE_BROWSER_CDMS' \
- '-DENABLE_CONFIGURATION_POLICY' \
- '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
- '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DENABLE_EGLIMAGE=1' \
- '-DCLD_VERSION=1' \
- '-DENABLE_PRINTING=1' \
- '-DENABLE_MANAGED_USERS=1' \
- '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
- '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
- '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
- '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
- '-DVIDEO_HOLE=1' \
- '-DWEBRTC_RESTRICT_LOGGING' \
- '-DWEBRTC_MODULE_UTILITY_VIDEO' \
- '-DWEBRTC_CHROMIUM_BUILD' \
- '-DLOGGING_INSIDE_WEBRTC' \
- '-DWEBRTC_ARCH_ARM' \
- '-DWEBRTC_ARCH_ARM_V7' \
- '-DWEBRTC_DETECT_ARM_NEON' \
- '-DWEBRTC_POSIX' \
- '-DWEBRTC_LINUX' \
- '-DWEBRTC_ANDROID' \
- '-DWEBRTC_ANDROID_OPENSLES' \
- '-DWEBRTC_CODEC_OPUS' \
- '-DUSE_OPENSSL=1' \
- '-DUSE_OPENSSL_CERTS=1' \
- '-D__STDC_CONSTANT_MACROS' \
- '-D__STDC_FORMAT_MACROS' \
- '-DANDROID' \
- '-D__GNU_SOURCE=1' \
- '-DUSE_STLPORT=1' \
- '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
- '-DCHROME_BUILD_ID=""' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
- '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
- '-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
- $(LOCAL_PATH) \
- $(LOCAL_PATH)/third_party/webrtc/overrides \
- $(LOCAL_PATH)/third_party \
- $(LOCAL_PATH)/third_party/opus/src/celt \
- $(LOCAL_PATH)/third_party/opus/src/src \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \
- $(LOCAL_PATH)/third_party/webrtc \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \
- $(LOCAL_PATH)/third_party/opus/src/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \
- $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
- -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden \
- -Wsign-compare \
- -Wno-abi \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
- -fstack-protector \
- --param=ssp-buffer-size=4 \
- -Werror \
- -fno-exceptions \
- -fno-strict-aliasing \
- -Wall \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -fvisibility=hidden \
- -pipe \
- -fPIC \
- -Wno-unused-local-typedefs \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -fno-tree-sra \
- -fno-partial-inlining \
- -fno-early-inlining \
- -fno-tree-copy-prop \
- -fno-tree-loop-optimize \
- -fno-move-loop-invariants \
- -fno-caller-saves \
- -Wno-psabi \
- -ffunction-sections \
- -funwind-tables \
- -g \
- -fstack-protector \
- -fno-short-enums \
- -finline-limit=64 \
- -Wa,--noexecstack \
- -U_FORTIFY_SOURCE \
- -Wno-extra \
- -Wno-ignored-qualifiers \
- -Wno-type-limits \
- -Wno-unused-but-set-variable \
- -Os \
- -fno-ident \
- -fdata-sections \
- -ffunction-sections \
- -fomit-frame-pointer \
- -funwind-tables
-
-MY_DEFS_Release := \
- '-DV8_DEPRECATION_WARNINGS' \
- '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
- '-D_FILE_OFFSET_BITS=64' \
- '-DNO_TCMALLOC' \
- '-DDISABLE_NACL' \
- '-DCHROMIUM_BUILD' \
- '-DUSE_LIBJPEG_TURBO=1' \
- '-DENABLE_WEBRTC=1' \
- '-DUSE_PROPRIETARY_CODECS' \
- '-DENABLE_BROWSER_CDMS' \
- '-DENABLE_CONFIGURATION_POLICY' \
- '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
- '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DENABLE_EGLIMAGE=1' \
- '-DCLD_VERSION=1' \
- '-DENABLE_PRINTING=1' \
- '-DENABLE_MANAGED_USERS=1' \
- '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
- '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
- '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
- '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
- '-DVIDEO_HOLE=1' \
- '-DWEBRTC_RESTRICT_LOGGING' \
- '-DWEBRTC_MODULE_UTILITY_VIDEO' \
- '-DWEBRTC_CHROMIUM_BUILD' \
- '-DLOGGING_INSIDE_WEBRTC' \
- '-DWEBRTC_ARCH_ARM' \
- '-DWEBRTC_ARCH_ARM_V7' \
- '-DWEBRTC_DETECT_ARM_NEON' \
- '-DWEBRTC_POSIX' \
- '-DWEBRTC_LINUX' \
- '-DWEBRTC_ANDROID' \
- '-DWEBRTC_ANDROID_OPENSLES' \
- '-DWEBRTC_CODEC_OPUS' \
- '-DUSE_OPENSSL=1' \
- '-DUSE_OPENSSL_CERTS=1' \
- '-D__STDC_CONSTANT_MACROS' \
- '-D__STDC_FORMAT_MACROS' \
- '-DANDROID' \
- '-D__GNU_SOURCE=1' \
- '-DUSE_STLPORT=1' \
- '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
- '-DCHROME_BUILD_ID=""' \
- '-DNDEBUG' \
- '-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
- '-D_FORTIFY_SOURCE=2'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
- $(LOCAL_PATH) \
- $(LOCAL_PATH)/third_party/webrtc/overrides \
- $(LOCAL_PATH)/third_party \
- $(LOCAL_PATH)/third_party/opus/src/celt \
- $(LOCAL_PATH)/third_party/opus/src/src \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \
- $(LOCAL_PATH)/third_party/webrtc \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \
- $(LOCAL_PATH)/third_party/opus/src/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \
- $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
- -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden \
- -Wsign-compare \
- -Wno-abi \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
- -Wl,-z,now \
- -Wl,-z,relro \
- -Wl,--fatal-warnings \
- -Wl,-z,noexecstack \
- -fPIC \
- -Wl,-z,relro \
- -Wl,-z,now \
- -fuse-ld=gold \
- -nostdlib \
- -Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
- -Wl,--icf=safe \
- -Wl,--warn-shared-textrel \
- -Wl,-O1 \
- -Wl,--as-needed
-
-
-LOCAL_LDFLAGS_Release := \
- -Wl,-z,now \
- -Wl,-z,relro \
- -Wl,--fatal-warnings \
- -Wl,-z,noexecstack \
- -fPIC \
- -Wl,-z,relro \
- -Wl,-z,now \
- -fuse-ld=gold \
- -nostdlib \
- -Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
- -Wl,--icf=safe \
- -Wl,-O1 \
- -Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES := \
- libstlport \
- libdl
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp
-
-# Alias gyp target name.
-.PHONY: NetEq4
-NetEq4: third_party_webrtc_modules_NetEq4_gyp
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/NetEq4.target.linux-arm64.mk b/modules/NetEq4.target.linux-arm64.mk
deleted file mode 100644
index 5f9620b..0000000
--- a/modules/NetEq4.target.linux-arm64.mk
+++ /dev/null
@@ -1,357 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
- third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/merge.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \
- third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \
- third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \
- third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \
- third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
- --param=ssp-buffer-size=4 \
- -Werror \
- -fno-exceptions \
- -fno-strict-aliasing \
- -Wall \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -fvisibility=hidden \
- -pipe \
- -fPIC \
- -Wno-unused-local-typedefs \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -ffunction-sections \
- -funwind-tables \
- -g \
- -fno-short-enums \
- -finline-limit=64 \
- -Wa,--noexecstack \
- -U_FORTIFY_SOURCE \
- -Wno-extra \
- -Wno-ignored-qualifiers \
- -Wno-type-limits \
- -Wno-unused-but-set-variable \
- -Os \
- -g \
- -fomit-frame-pointer \
- -fdata-sections \
- -ffunction-sections \
- -funwind-tables
-
-MY_DEFS_Debug := \
- '-DV8_DEPRECATION_WARNINGS' \
- '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
- '-D_FILE_OFFSET_BITS=64' \
- '-DNO_TCMALLOC' \
- '-DDISABLE_NACL' \
- '-DCHROMIUM_BUILD' \
- '-DUSE_LIBJPEG_TURBO=1' \
- '-DENABLE_WEBRTC=1' \
- '-DUSE_PROPRIETARY_CODECS' \
- '-DENABLE_BROWSER_CDMS' \
- '-DENABLE_CONFIGURATION_POLICY' \
- '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
- '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DENABLE_EGLIMAGE=1' \
- '-DCLD_VERSION=1' \
- '-DENABLE_PRINTING=1' \
- '-DENABLE_MANAGED_USERS=1' \
- '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
- '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
- '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
- '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
- '-DVIDEO_HOLE=1' \
- '-DWEBRTC_RESTRICT_LOGGING' \
- '-DWEBRTC_MODULE_UTILITY_VIDEO' \
- '-DWEBRTC_CHROMIUM_BUILD' \
- '-DLOGGING_INSIDE_WEBRTC' \
- '-DWEBRTC_POSIX' \
- '-DWEBRTC_LINUX' \
- '-DWEBRTC_ANDROID' \
- '-DWEBRTC_ANDROID_OPENSLES' \
- '-DWEBRTC_CODEC_OPUS' \
- '-DUSE_OPENSSL=1' \
- '-DUSE_OPENSSL_CERTS=1' \
- '-D__STDC_CONSTANT_MACROS' \
- '-D__STDC_FORMAT_MACROS' \
- '-DANDROID' \
- '-D__GNU_SOURCE=1' \
- '-DUSE_STLPORT=1' \
- '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
- '-DCHROME_BUILD_ID=""' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
- '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
- '-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
- $(LOCAL_PATH) \
- $(LOCAL_PATH)/third_party/webrtc/overrides \
- $(LOCAL_PATH)/third_party \
- $(LOCAL_PATH)/third_party/opus/src/celt \
- $(LOCAL_PATH)/third_party/opus/src/src \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \
- $(LOCAL_PATH)/third_party/webrtc \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \
- $(LOCAL_PATH)/third_party/opus/src/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \
- $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
- -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden \
- -Wsign-compare \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
- --param=ssp-buffer-size=4 \
- -Werror \
- -fno-exceptions \
- -fno-strict-aliasing \
- -Wall \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -fvisibility=hidden \
- -pipe \
- -fPIC \
- -Wno-unused-local-typedefs \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -ffunction-sections \
- -funwind-tables \
- -g \
- -fno-short-enums \
- -finline-limit=64 \
- -Wa,--noexecstack \
- -U_FORTIFY_SOURCE \
- -Wno-extra \
- -Wno-ignored-qualifiers \
- -Wno-type-limits \
- -Wno-unused-but-set-variable \
- -Os \
- -fno-ident \
- -fdata-sections \
- -ffunction-sections \
- -fomit-frame-pointer \
- -funwind-tables
-
-MY_DEFS_Release := \
- '-DV8_DEPRECATION_WARNINGS' \
- '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
- '-D_FILE_OFFSET_BITS=64' \
- '-DNO_TCMALLOC' \
- '-DDISABLE_NACL' \
- '-DCHROMIUM_BUILD' \
- '-DUSE_LIBJPEG_TURBO=1' \
- '-DENABLE_WEBRTC=1' \
- '-DUSE_PROPRIETARY_CODECS' \
- '-DENABLE_BROWSER_CDMS' \
- '-DENABLE_CONFIGURATION_POLICY' \
- '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
- '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DENABLE_EGLIMAGE=1' \
- '-DCLD_VERSION=1' \
- '-DENABLE_PRINTING=1' \
- '-DENABLE_MANAGED_USERS=1' \
- '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
- '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
- '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
- '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
- '-DVIDEO_HOLE=1' \
- '-DWEBRTC_RESTRICT_LOGGING' \
- '-DWEBRTC_MODULE_UTILITY_VIDEO' \
- '-DWEBRTC_CHROMIUM_BUILD' \
- '-DLOGGING_INSIDE_WEBRTC' \
- '-DWEBRTC_POSIX' \
- '-DWEBRTC_LINUX' \
- '-DWEBRTC_ANDROID' \
- '-DWEBRTC_ANDROID_OPENSLES' \
- '-DWEBRTC_CODEC_OPUS' \
- '-DUSE_OPENSSL=1' \
- '-DUSE_OPENSSL_CERTS=1' \
- '-D__STDC_CONSTANT_MACROS' \
- '-D__STDC_FORMAT_MACROS' \
- '-DANDROID' \
- '-D__GNU_SOURCE=1' \
- '-DUSE_STLPORT=1' \
- '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
- '-DCHROME_BUILD_ID=""' \
- '-DNDEBUG' \
- '-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
- '-D_FORTIFY_SOURCE=2'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
- $(LOCAL_PATH) \
- $(LOCAL_PATH)/third_party/webrtc/overrides \
- $(LOCAL_PATH)/third_party \
- $(LOCAL_PATH)/third_party/opus/src/celt \
- $(LOCAL_PATH)/third_party/opus/src/src \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \
- $(LOCAL_PATH)/third_party/webrtc \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \
- $(LOCAL_PATH)/third_party/opus/src/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \
- $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
- -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden \
- -Wsign-compare \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
- -Wl,-z,now \
- -Wl,-z,relro \
- -Wl,--fatal-warnings \
- -Wl,-z,noexecstack \
- -fPIC \
- -nostdlib \
- -Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
- -Wl,--warn-shared-textrel \
- -Wl,-O1 \
- -Wl,--as-needed
-
-
-LOCAL_LDFLAGS_Release := \
- -Wl,-z,now \
- -Wl,-z,relro \
- -Wl,--fatal-warnings \
- -Wl,-z,noexecstack \
- -fPIC \
- -nostdlib \
- -Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
- -Wl,-O1 \
- -Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES := \
- libstlport \
- libdl
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp
-
-# Alias gyp target name.
-.PHONY: NetEq4
-NetEq4: third_party_webrtc_modules_NetEq4_gyp
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/NetEq4.target.linux-mips.mk b/modules/NetEq4.target.linux-mips.mk
deleted file mode 100644
index 13f5d25..0000000
--- a/modules/NetEq4.target.linux-mips.mk
+++ /dev/null
@@ -1,379 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
- third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/merge.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \
- third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \
- third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \
- third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \
- third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
- -fstack-protector \
- --param=ssp-buffer-size=4 \
- \
- -fno-exceptions \
- -fno-strict-aliasing \
- -Wall \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -fvisibility=hidden \
- -pipe \
- -fPIC \
- -Wno-unused-local-typedefs \
- -mhard-float \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -mhard-float \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -EL \
- -mhard-float \
- -ffunction-sections \
- -funwind-tables \
- -g \
- -fstack-protector \
- -fno-short-enums \
- -finline-limit=64 \
- -Wa,--noexecstack \
- -U_FORTIFY_SOURCE \
- -Wno-extra \
- -Wno-ignored-qualifiers \
- -Wno-type-limits \
- -Wno-unused-but-set-variable \
- -Os \
- -g \
- -fomit-frame-pointer \
- -fdata-sections \
- -ffunction-sections \
- -funwind-tables
-
-MY_DEFS_Debug := \
- '-DV8_DEPRECATION_WARNINGS' \
- '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
- '-D_FILE_OFFSET_BITS=64' \
- '-DNO_TCMALLOC' \
- '-DDISABLE_NACL' \
- '-DCHROMIUM_BUILD' \
- '-DUSE_LIBJPEG_TURBO=1' \
- '-DENABLE_WEBRTC=1' \
- '-DUSE_PROPRIETARY_CODECS' \
- '-DENABLE_BROWSER_CDMS' \
- '-DENABLE_CONFIGURATION_POLICY' \
- '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
- '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DENABLE_EGLIMAGE=1' \
- '-DCLD_VERSION=1' \
- '-DENABLE_PRINTING=1' \
- '-DENABLE_MANAGED_USERS=1' \
- '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
- '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
- '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
- '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
- '-DVIDEO_HOLE=1' \
- '-DWEBRTC_RESTRICT_LOGGING' \
- '-DWEBRTC_MODULE_UTILITY_VIDEO' \
- '-DWEBRTC_CHROMIUM_BUILD' \
- '-DLOGGING_INSIDE_WEBRTC' \
- '-DMIPS32_LE' \
- '-DMIPS_FPU_LE' \
- '-DWEBRTC_POSIX' \
- '-DWEBRTC_LINUX' \
- '-DWEBRTC_ANDROID' \
- '-DWEBRTC_ANDROID_OPENSLES' \
- '-DWEBRTC_CODEC_OPUS' \
- '-DUSE_OPENSSL=1' \
- '-DUSE_OPENSSL_CERTS=1' \
- '-D__STDC_CONSTANT_MACROS' \
- '-D__STDC_FORMAT_MACROS' \
- '-DANDROID' \
- '-D__GNU_SOURCE=1' \
- '-DUSE_STLPORT=1' \
- '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
- '-DCHROME_BUILD_ID=""' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
- '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
- '-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
- $(LOCAL_PATH) \
- $(LOCAL_PATH)/third_party/webrtc/overrides \
- $(LOCAL_PATH)/third_party \
- $(LOCAL_PATH)/third_party/opus/src/celt \
- $(LOCAL_PATH)/third_party/opus/src/src \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \
- $(LOCAL_PATH)/third_party/webrtc \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \
- $(LOCAL_PATH)/third_party/opus/src/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \
- $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
- -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden \
- -Wsign-compare \
- -Wno-uninitialized \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
- -fstack-protector \
- --param=ssp-buffer-size=4 \
- \
- -fno-exceptions \
- -fno-strict-aliasing \
- -Wall \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -fvisibility=hidden \
- -pipe \
- -fPIC \
- -Wno-unused-local-typedefs \
- -mhard-float \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -mhard-float \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -EL \
- -mhard-float \
- -ffunction-sections \
- -funwind-tables \
- -g \
- -fstack-protector \
- -fno-short-enums \
- -finline-limit=64 \
- -Wa,--noexecstack \
- -U_FORTIFY_SOURCE \
- -Wno-extra \
- -Wno-ignored-qualifiers \
- -Wno-type-limits \
- -Wno-unused-but-set-variable \
- -Os \
- -fno-ident \
- -fdata-sections \
- -ffunction-sections \
- -fomit-frame-pointer \
- -funwind-tables
-
-MY_DEFS_Release := \
- '-DV8_DEPRECATION_WARNINGS' \
- '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
- '-D_FILE_OFFSET_BITS=64' \
- '-DNO_TCMALLOC' \
- '-DDISABLE_NACL' \
- '-DCHROMIUM_BUILD' \
- '-DUSE_LIBJPEG_TURBO=1' \
- '-DENABLE_WEBRTC=1' \
- '-DUSE_PROPRIETARY_CODECS' \
- '-DENABLE_BROWSER_CDMS' \
- '-DENABLE_CONFIGURATION_POLICY' \
- '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
- '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DENABLE_EGLIMAGE=1' \
- '-DCLD_VERSION=1' \
- '-DENABLE_PRINTING=1' \
- '-DENABLE_MANAGED_USERS=1' \
- '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
- '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
- '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
- '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
- '-DVIDEO_HOLE=1' \
- '-DWEBRTC_RESTRICT_LOGGING' \
- '-DWEBRTC_MODULE_UTILITY_VIDEO' \
- '-DWEBRTC_CHROMIUM_BUILD' \
- '-DLOGGING_INSIDE_WEBRTC' \
- '-DMIPS32_LE' \
- '-DMIPS_FPU_LE' \
- '-DWEBRTC_POSIX' \
- '-DWEBRTC_LINUX' \
- '-DWEBRTC_ANDROID' \
- '-DWEBRTC_ANDROID_OPENSLES' \
- '-DWEBRTC_CODEC_OPUS' \
- '-DUSE_OPENSSL=1' \
- '-DUSE_OPENSSL_CERTS=1' \
- '-D__STDC_CONSTANT_MACROS' \
- '-D__STDC_FORMAT_MACROS' \
- '-DANDROID' \
- '-D__GNU_SOURCE=1' \
- '-DUSE_STLPORT=1' \
- '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
- '-DCHROME_BUILD_ID=""' \
- '-DNDEBUG' \
- '-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
- '-D_FORTIFY_SOURCE=2'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
- $(LOCAL_PATH) \
- $(LOCAL_PATH)/third_party/webrtc/overrides \
- $(LOCAL_PATH)/third_party \
- $(LOCAL_PATH)/third_party/opus/src/celt \
- $(LOCAL_PATH)/third_party/opus/src/src \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \
- $(LOCAL_PATH)/third_party/webrtc \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \
- $(LOCAL_PATH)/third_party/opus/src/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \
- $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
- -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden \
- -Wsign-compare \
- -Wno-uninitialized \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
- -Wl,-z,now \
- -Wl,-z,relro \
- -Wl,--fatal-warnings \
- -Wl,-z,noexecstack \
- -fPIC \
- -EL \
- -Wl,--no-keep-memory \
- -nostdlib \
- -Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
- -Wl,--warn-shared-textrel \
- -Wl,-O1 \
- -Wl,--as-needed
-
-
-LOCAL_LDFLAGS_Release := \
- -Wl,-z,now \
- -Wl,-z,relro \
- -Wl,--fatal-warnings \
- -Wl,-z,noexecstack \
- -fPIC \
- -EL \
- -Wl,--no-keep-memory \
- -nostdlib \
- -Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
- -Wl,-O1 \
- -Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES := \
- libstlport \
- libdl
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp
-
-# Alias gyp target name.
-.PHONY: NetEq4
-NetEq4: third_party_webrtc_modules_NetEq4_gyp
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/NetEq4.target.linux-x86.mk b/modules/NetEq4.target.linux-x86.mk
deleted file mode 100644
index 0f95630..0000000
--- a/modules/NetEq4.target.linux-x86.mk
+++ /dev/null
@@ -1,371 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
- third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/merge.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \
- third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \
- third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \
- third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \
- third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
- --param=ssp-buffer-size=4 \
- -Werror \
- -fno-exceptions \
- -fno-strict-aliasing \
- -Wall \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -fvisibility=hidden \
- -pipe \
- -fPIC \
- -Wno-unused-local-typedefs \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -msse2 \
- -mfpmath=sse \
- -mmmx \
- -m32 \
- -ffunction-sections \
- -funwind-tables \
- -g \
- -fno-short-enums \
- -finline-limit=64 \
- -Wa,--noexecstack \
- -U_FORTIFY_SOURCE \
- -Wno-extra \
- -Wno-ignored-qualifiers \
- -Wno-type-limits \
- -Wno-unused-but-set-variable \
- -fno-stack-protector \
- -Os \
- -g \
- -fomit-frame-pointer \
- -fdata-sections \
- -ffunction-sections \
- -funwind-tables
-
-MY_DEFS_Debug := \
- '-DV8_DEPRECATION_WARNINGS' \
- '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
- '-D_FILE_OFFSET_BITS=64' \
- '-DNO_TCMALLOC' \
- '-DDISABLE_NACL' \
- '-DCHROMIUM_BUILD' \
- '-DUSE_LIBJPEG_TURBO=1' \
- '-DENABLE_WEBRTC=1' \
- '-DUSE_PROPRIETARY_CODECS' \
- '-DENABLE_BROWSER_CDMS' \
- '-DENABLE_CONFIGURATION_POLICY' \
- '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
- '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DENABLE_EGLIMAGE=1' \
- '-DCLD_VERSION=1' \
- '-DENABLE_PRINTING=1' \
- '-DENABLE_MANAGED_USERS=1' \
- '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
- '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
- '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
- '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
- '-DVIDEO_HOLE=1' \
- '-DWEBRTC_RESTRICT_LOGGING' \
- '-DWEBRTC_MODULE_UTILITY_VIDEO' \
- '-DWEBRTC_CHROMIUM_BUILD' \
- '-DLOGGING_INSIDE_WEBRTC' \
- '-DWEBRTC_POSIX' \
- '-DWEBRTC_LINUX' \
- '-DWEBRTC_ANDROID' \
- '-DWEBRTC_ANDROID_OPENSLES' \
- '-DWEBRTC_CODEC_OPUS' \
- '-DUSE_OPENSSL=1' \
- '-DUSE_OPENSSL_CERTS=1' \
- '-D__STDC_CONSTANT_MACROS' \
- '-D__STDC_FORMAT_MACROS' \
- '-DANDROID' \
- '-D__GNU_SOURCE=1' \
- '-DUSE_STLPORT=1' \
- '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
- '-DCHROME_BUILD_ID=""' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
- '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
- '-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
- $(LOCAL_PATH) \
- $(LOCAL_PATH)/third_party/webrtc/overrides \
- $(LOCAL_PATH)/third_party \
- $(LOCAL_PATH)/third_party/opus/src/celt \
- $(LOCAL_PATH)/third_party/opus/src/src \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \
- $(LOCAL_PATH)/third_party/webrtc \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \
- $(LOCAL_PATH)/third_party/opus/src/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \
- $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
- -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden \
- -Wsign-compare \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
- --param=ssp-buffer-size=4 \
- -Werror \
- -fno-exceptions \
- -fno-strict-aliasing \
- -Wall \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -fvisibility=hidden \
- -pipe \
- -fPIC \
- -Wno-unused-local-typedefs \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -msse2 \
- -mfpmath=sse \
- -mmmx \
- -m32 \
- -ffunction-sections \
- -funwind-tables \
- -g \
- -fno-short-enums \
- -finline-limit=64 \
- -Wa,--noexecstack \
- -U_FORTIFY_SOURCE \
- -Wno-extra \
- -Wno-ignored-qualifiers \
- -Wno-type-limits \
- -Wno-unused-but-set-variable \
- -fno-stack-protector \
- -Os \
- -fno-ident \
- -fdata-sections \
- -ffunction-sections \
- -fomit-frame-pointer \
- -funwind-tables
-
-MY_DEFS_Release := \
- '-DV8_DEPRECATION_WARNINGS' \
- '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
- '-D_FILE_OFFSET_BITS=64' \
- '-DNO_TCMALLOC' \
- '-DDISABLE_NACL' \
- '-DCHROMIUM_BUILD' \
- '-DUSE_LIBJPEG_TURBO=1' \
- '-DENABLE_WEBRTC=1' \
- '-DUSE_PROPRIETARY_CODECS' \
- '-DENABLE_BROWSER_CDMS' \
- '-DENABLE_CONFIGURATION_POLICY' \
- '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
- '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DENABLE_EGLIMAGE=1' \
- '-DCLD_VERSION=1' \
- '-DENABLE_PRINTING=1' \
- '-DENABLE_MANAGED_USERS=1' \
- '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
- '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
- '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
- '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
- '-DVIDEO_HOLE=1' \
- '-DWEBRTC_RESTRICT_LOGGING' \
- '-DWEBRTC_MODULE_UTILITY_VIDEO' \
- '-DWEBRTC_CHROMIUM_BUILD' \
- '-DLOGGING_INSIDE_WEBRTC' \
- '-DWEBRTC_POSIX' \
- '-DWEBRTC_LINUX' \
- '-DWEBRTC_ANDROID' \
- '-DWEBRTC_ANDROID_OPENSLES' \
- '-DWEBRTC_CODEC_OPUS' \
- '-DUSE_OPENSSL=1' \
- '-DUSE_OPENSSL_CERTS=1' \
- '-D__STDC_CONSTANT_MACROS' \
- '-D__STDC_FORMAT_MACROS' \
- '-DANDROID' \
- '-D__GNU_SOURCE=1' \
- '-DUSE_STLPORT=1' \
- '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
- '-DCHROME_BUILD_ID=""' \
- '-DNDEBUG' \
- '-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
- '-D_FORTIFY_SOURCE=2'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
- $(LOCAL_PATH) \
- $(LOCAL_PATH)/third_party/webrtc/overrides \
- $(LOCAL_PATH)/third_party \
- $(LOCAL_PATH)/third_party/opus/src/celt \
- $(LOCAL_PATH)/third_party/opus/src/src \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \
- $(LOCAL_PATH)/third_party/webrtc \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \
- $(LOCAL_PATH)/third_party/opus/src/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \
- $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
- -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden \
- -Wsign-compare \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
- -Wl,-z,now \
- -Wl,-z,relro \
- -Wl,--fatal-warnings \
- -Wl,-z,noexecstack \
- -fPIC \
- -m32 \
- -fuse-ld=gold \
- -nostdlib \
- -Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
- -Wl,--warn-shared-textrel \
- -Wl,-O1 \
- -Wl,--as-needed
-
-
-LOCAL_LDFLAGS_Release := \
- -Wl,-z,now \
- -Wl,-z,relro \
- -Wl,--fatal-warnings \
- -Wl,-z,noexecstack \
- -fPIC \
- -m32 \
- -fuse-ld=gold \
- -nostdlib \
- -Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
- -Wl,-O1 \
- -Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES := \
- libstlport \
- libdl
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp
-
-# Alias gyp target name.
-.PHONY: NetEq4
-NetEq4: third_party_webrtc_modules_NetEq4_gyp
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/NetEq4.target.linux-x86_64.mk b/modules/NetEq4.target.linux-x86_64.mk
deleted file mode 100644
index 01f3668..0000000
--- a/modules/NetEq4.target.linux-x86_64.mk
+++ /dev/null
@@ -1,369 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
- third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/merge.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \
- third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \
- third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \
- third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \
- third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
- -fstack-protector \
- --param=ssp-buffer-size=4 \
- -Werror \
- -fno-exceptions \
- -fno-strict-aliasing \
- -Wall \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -fvisibility=hidden \
- -pipe \
- -fPIC \
- -Wno-unused-local-typedefs \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -m64 \
- -march=x86-64 \
- -ffunction-sections \
- -funwind-tables \
- -g \
- -fstack-protector \
- -fno-short-enums \
- -finline-limit=64 \
- -Wa,--noexecstack \
- -U_FORTIFY_SOURCE \
- -Wno-extra \
- -Wno-ignored-qualifiers \
- -Wno-type-limits \
- -Wno-unused-but-set-variable \
- -Os \
- -g \
- -fomit-frame-pointer \
- -fdata-sections \
- -ffunction-sections \
- -funwind-tables
-
-MY_DEFS_Debug := \
- '-DV8_DEPRECATION_WARNINGS' \
- '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
- '-D_FILE_OFFSET_BITS=64' \
- '-DNO_TCMALLOC' \
- '-DDISABLE_NACL' \
- '-DCHROMIUM_BUILD' \
- '-DUSE_LIBJPEG_TURBO=1' \
- '-DENABLE_WEBRTC=1' \
- '-DUSE_PROPRIETARY_CODECS' \
- '-DENABLE_BROWSER_CDMS' \
- '-DENABLE_CONFIGURATION_POLICY' \
- '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
- '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DENABLE_EGLIMAGE=1' \
- '-DCLD_VERSION=1' \
- '-DENABLE_PRINTING=1' \
- '-DENABLE_MANAGED_USERS=1' \
- '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
- '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
- '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
- '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
- '-DVIDEO_HOLE=1' \
- '-DWEBRTC_RESTRICT_LOGGING' \
- '-DWEBRTC_MODULE_UTILITY_VIDEO' \
- '-DWEBRTC_CHROMIUM_BUILD' \
- '-DLOGGING_INSIDE_WEBRTC' \
- '-DWEBRTC_POSIX' \
- '-DWEBRTC_LINUX' \
- '-DWEBRTC_ANDROID' \
- '-DWEBRTC_ANDROID_OPENSLES' \
- '-DWEBRTC_CODEC_OPUS' \
- '-DUSE_OPENSSL=1' \
- '-DUSE_OPENSSL_CERTS=1' \
- '-D__STDC_CONSTANT_MACROS' \
- '-D__STDC_FORMAT_MACROS' \
- '-DANDROID' \
- '-D__GNU_SOURCE=1' \
- '-DUSE_STLPORT=1' \
- '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
- '-DCHROME_BUILD_ID=""' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
- '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
- '-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
- $(LOCAL_PATH) \
- $(LOCAL_PATH)/third_party/webrtc/overrides \
- $(LOCAL_PATH)/third_party \
- $(LOCAL_PATH)/third_party/opus/src/celt \
- $(LOCAL_PATH)/third_party/opus/src/src \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \
- $(LOCAL_PATH)/third_party/webrtc \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \
- $(LOCAL_PATH)/third_party/opus/src/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \
- $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
- -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden \
- -Wsign-compare \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
- -fstack-protector \
- --param=ssp-buffer-size=4 \
- -Werror \
- -fno-exceptions \
- -fno-strict-aliasing \
- -Wall \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -fvisibility=hidden \
- -pipe \
- -fPIC \
- -Wno-unused-local-typedefs \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -fno-builtin-cos \
- -fno-builtin-sin \
- -fno-builtin-cosf \
- -fno-builtin-sinf \
- -m64 \
- -march=x86-64 \
- -ffunction-sections \
- -funwind-tables \
- -g \
- -fstack-protector \
- -fno-short-enums \
- -finline-limit=64 \
- -Wa,--noexecstack \
- -U_FORTIFY_SOURCE \
- -Wno-extra \
- -Wno-ignored-qualifiers \
- -Wno-type-limits \
- -Wno-unused-but-set-variable \
- -Os \
- -fno-ident \
- -fdata-sections \
- -ffunction-sections \
- -fomit-frame-pointer \
- -funwind-tables
-
-MY_DEFS_Release := \
- '-DV8_DEPRECATION_WARNINGS' \
- '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
- '-D_FILE_OFFSET_BITS=64' \
- '-DNO_TCMALLOC' \
- '-DDISABLE_NACL' \
- '-DCHROMIUM_BUILD' \
- '-DUSE_LIBJPEG_TURBO=1' \
- '-DENABLE_WEBRTC=1' \
- '-DUSE_PROPRIETARY_CODECS' \
- '-DENABLE_BROWSER_CDMS' \
- '-DENABLE_CONFIGURATION_POLICY' \
- '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
- '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DENABLE_EGLIMAGE=1' \
- '-DCLD_VERSION=1' \
- '-DENABLE_PRINTING=1' \
- '-DENABLE_MANAGED_USERS=1' \
- '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
- '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
- '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
- '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
- '-DVIDEO_HOLE=1' \
- '-DWEBRTC_RESTRICT_LOGGING' \
- '-DWEBRTC_MODULE_UTILITY_VIDEO' \
- '-DWEBRTC_CHROMIUM_BUILD' \
- '-DLOGGING_INSIDE_WEBRTC' \
- '-DWEBRTC_POSIX' \
- '-DWEBRTC_LINUX' \
- '-DWEBRTC_ANDROID' \
- '-DWEBRTC_ANDROID_OPENSLES' \
- '-DWEBRTC_CODEC_OPUS' \
- '-DUSE_OPENSSL=1' \
- '-DUSE_OPENSSL_CERTS=1' \
- '-D__STDC_CONSTANT_MACROS' \
- '-D__STDC_FORMAT_MACROS' \
- '-DANDROID' \
- '-D__GNU_SOURCE=1' \
- '-DUSE_STLPORT=1' \
- '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
- '-DCHROME_BUILD_ID=""' \
- '-DNDEBUG' \
- '-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
- '-D_FORTIFY_SOURCE=2'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
- $(LOCAL_PATH) \
- $(LOCAL_PATH)/third_party/webrtc/overrides \
- $(LOCAL_PATH)/third_party \
- $(LOCAL_PATH)/third_party/opus/src/celt \
- $(LOCAL_PATH)/third_party/opus/src/src \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g711/include \
- $(LOCAL_PATH)/third_party/webrtc \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/g722/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/pcm16b/include \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/ilbc/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/main/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/isac/fix/interface \
- $(LOCAL_PATH)/third_party/webrtc/modules/audio_coding/codecs/cng/include \
- $(LOCAL_PATH)/third_party/opus/src/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/resampler/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/signal_processing/include \
- $(LOCAL_PATH)/third_party/webrtc/common_audio/vad/include \
- $(LOCAL_PATH)/third_party/webrtc/system_wrappers/interface \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
- -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden \
- -Wsign-compare \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
- -Wl,-z,now \
- -Wl,-z,relro \
- -Wl,--fatal-warnings \
- -Wl,-z,noexecstack \
- -fPIC \
- -m64 \
- -fuse-ld=gold \
- -nostdlib \
- -Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
- -Wl,--warn-shared-textrel \
- -Wl,-O1 \
- -Wl,--as-needed
-
-
-LOCAL_LDFLAGS_Release := \
- -Wl,-z,now \
- -Wl,-z,relro \
- -Wl,--fatal-warnings \
- -Wl,-z,noexecstack \
- -fPIC \
- -m64 \
- -fuse-ld=gold \
- -nostdlib \
- -Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
- -Wl,-O1 \
- -Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES := \
- libstlport \
- libdl
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp
-
-# Alias gyp target name.
-.PHONY: NetEq4
-NetEq4: third_party_webrtc_modules_NetEq4_gyp
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/PCM16B.target.darwin-arm.mk b/modules/PCM16B.target.darwin-arm.mk
index e1d4611..49eb950 100644
--- a/modules/PCM16B.target.darwin-arm.mk
+++ b/modules/PCM16B.target.darwin-arm.mk
@@ -125,6 +125,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -246,6 +247,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/PCM16B.target.darwin-arm64.mk b/modules/PCM16B.target.darwin-arm64.mk
index 961ffcb..afa31cc 100644
--- a/modules/PCM16B.target.darwin-arm64.mk
+++ b/modules/PCM16B.target.darwin-arm64.mk
@@ -112,6 +112,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -219,6 +220,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/PCM16B.target.darwin-mips.mk b/modules/PCM16B.target.darwin-mips.mk
index 4bfc572..8a0054c 100644
--- a/modules/PCM16B.target.darwin-mips.mk
+++ b/modules/PCM16B.target.darwin-mips.mk
@@ -120,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -236,6 +237,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/PCM16B.target.darwin-x86.mk b/modules/PCM16B.target.darwin-x86.mk
index 6301c13..1288e02 100644
--- a/modules/PCM16B.target.darwin-x86.mk
+++ b/modules/PCM16B.target.darwin-x86.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -229,6 +230,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/PCM16B.target.darwin-x86_64.mk b/modules/PCM16B.target.darwin-x86_64.mk
index 3debfcd..db00bf3 100644
--- a/modules/PCM16B.target.darwin-x86_64.mk
+++ b/modules/PCM16B.target.darwin-x86_64.mk
@@ -116,6 +116,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -227,6 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/PCM16B.target.linux-arm.mk b/modules/PCM16B.target.linux-arm.mk
index e1d4611..49eb950 100644
--- a/modules/PCM16B.target.linux-arm.mk
+++ b/modules/PCM16B.target.linux-arm.mk
@@ -125,6 +125,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -246,6 +247,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/PCM16B.target.linux-arm64.mk b/modules/PCM16B.target.linux-arm64.mk
index 961ffcb..afa31cc 100644
--- a/modules/PCM16B.target.linux-arm64.mk
+++ b/modules/PCM16B.target.linux-arm64.mk
@@ -112,6 +112,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -219,6 +220,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/PCM16B.target.linux-mips.mk b/modules/PCM16B.target.linux-mips.mk
index 4bfc572..8a0054c 100644
--- a/modules/PCM16B.target.linux-mips.mk
+++ b/modules/PCM16B.target.linux-mips.mk
@@ -120,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -236,6 +237,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/PCM16B.target.linux-x86.mk b/modules/PCM16B.target.linux-x86.mk
index 6301c13..1288e02 100644
--- a/modules/PCM16B.target.linux-x86.mk
+++ b/modules/PCM16B.target.linux-x86.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -229,6 +230,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/PCM16B.target.linux-x86_64.mk b/modules/PCM16B.target.linux-x86_64.mk
index 3debfcd..db00bf3 100644
--- a/modules/PCM16B.target.linux-x86_64.mk
+++ b/modules/PCM16B.target.linux-x86_64.mk
@@ -116,6 +116,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -227,6 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_coding_module.target.darwin-arm.mk b/modules/audio_coding_module.target.darwin-arm.mk
index 64401e3..1d5316f 100644
--- a/modules/audio_coding_module.target.darwin-arm.mk
+++ b/modules/audio_coding_module.target.darwin-arm.mk
@@ -154,6 +154,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -291,6 +292,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_coding_module.target.darwin-arm64.mk b/modules/audio_coding_module.target.darwin-arm64.mk
index 8ade216..fcf927b 100644
--- a/modules/audio_coding_module.target.darwin-arm64.mk
+++ b/modules/audio_coding_module.target.darwin-arm64.mk
@@ -141,6 +141,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -264,6 +265,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_coding_module.target.darwin-mips.mk b/modules/audio_coding_module.target.darwin-mips.mk
index a0022f2..c861152 100644
--- a/modules/audio_coding_module.target.darwin-mips.mk
+++ b/modules/audio_coding_module.target.darwin-mips.mk
@@ -149,6 +149,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -281,6 +282,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_coding_module.target.darwin-x86.mk b/modules/audio_coding_module.target.darwin-x86.mk
index b84a7fb..4f2b1eb 100644
--- a/modules/audio_coding_module.target.darwin-x86.mk
+++ b/modules/audio_coding_module.target.darwin-x86.mk
@@ -146,6 +146,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -274,6 +275,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_coding_module.target.darwin-x86_64.mk b/modules/audio_coding_module.target.darwin-x86_64.mk
index 45ca0e9..9abccc2 100644
--- a/modules/audio_coding_module.target.darwin-x86_64.mk
+++ b/modules/audio_coding_module.target.darwin-x86_64.mk
@@ -145,6 +145,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -272,6 +273,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_coding_module.target.linux-arm.mk b/modules/audio_coding_module.target.linux-arm.mk
index 64401e3..1d5316f 100644
--- a/modules/audio_coding_module.target.linux-arm.mk
+++ b/modules/audio_coding_module.target.linux-arm.mk
@@ -154,6 +154,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -291,6 +292,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_coding_module.target.linux-arm64.mk b/modules/audio_coding_module.target.linux-arm64.mk
index 8ade216..fcf927b 100644
--- a/modules/audio_coding_module.target.linux-arm64.mk
+++ b/modules/audio_coding_module.target.linux-arm64.mk
@@ -141,6 +141,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -264,6 +265,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_coding_module.target.linux-mips.mk b/modules/audio_coding_module.target.linux-mips.mk
index a0022f2..c861152 100644
--- a/modules/audio_coding_module.target.linux-mips.mk
+++ b/modules/audio_coding_module.target.linux-mips.mk
@@ -149,6 +149,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -281,6 +282,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_coding_module.target.linux-x86.mk b/modules/audio_coding_module.target.linux-x86.mk
index b84a7fb..4f2b1eb 100644
--- a/modules/audio_coding_module.target.linux-x86.mk
+++ b/modules/audio_coding_module.target.linux-x86.mk
@@ -146,6 +146,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -274,6 +275,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_coding_module.target.linux-x86_64.mk b/modules/audio_coding_module.target.linux-x86_64.mk
index 45ca0e9..9abccc2 100644
--- a/modules/audio_coding_module.target.linux-x86_64.mk
+++ b/modules/audio_coding_module.target.linux-x86_64.mk
@@ -145,6 +145,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -272,6 +273,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_conference_mixer.target.darwin-arm.mk b/modules/audio_conference_mixer.target.darwin-arm.mk
index adeaace..1c81635 100644
--- a/modules/audio_conference_mixer.target.darwin-arm.mk
+++ b/modules/audio_conference_mixer.target.darwin-arm.mk
@@ -129,6 +129,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -251,6 +252,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_conference_mixer.target.darwin-arm64.mk b/modules/audio_conference_mixer.target.darwin-arm64.mk
index 0faabfa..52a59fa 100644
--- a/modules/audio_conference_mixer.target.darwin-arm64.mk
+++ b/modules/audio_conference_mixer.target.darwin-arm64.mk
@@ -116,6 +116,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -224,6 +225,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_conference_mixer.target.darwin-mips.mk b/modules/audio_conference_mixer.target.darwin-mips.mk
index 5893b3a..68f2c3c 100644
--- a/modules/audio_conference_mixer.target.darwin-mips.mk
+++ b/modules/audio_conference_mixer.target.darwin-mips.mk
@@ -124,6 +124,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -241,6 +242,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_conference_mixer.target.darwin-x86.mk b/modules/audio_conference_mixer.target.darwin-x86.mk
index ca559ba..819b6d7 100644
--- a/modules/audio_conference_mixer.target.darwin-x86.mk
+++ b/modules/audio_conference_mixer.target.darwin-x86.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -234,6 +235,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_conference_mixer.target.darwin-x86_64.mk b/modules/audio_conference_mixer.target.darwin-x86_64.mk
index 5a134b6..d3ce540 100644
--- a/modules/audio_conference_mixer.target.darwin-x86_64.mk
+++ b/modules/audio_conference_mixer.target.darwin-x86_64.mk
@@ -120,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -232,6 +233,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_conference_mixer.target.linux-arm.mk b/modules/audio_conference_mixer.target.linux-arm.mk
index adeaace..1c81635 100644
--- a/modules/audio_conference_mixer.target.linux-arm.mk
+++ b/modules/audio_conference_mixer.target.linux-arm.mk
@@ -129,6 +129,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -251,6 +252,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_conference_mixer.target.linux-arm64.mk b/modules/audio_conference_mixer.target.linux-arm64.mk
index 0faabfa..52a59fa 100644
--- a/modules/audio_conference_mixer.target.linux-arm64.mk
+++ b/modules/audio_conference_mixer.target.linux-arm64.mk
@@ -116,6 +116,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -224,6 +225,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_conference_mixer.target.linux-mips.mk b/modules/audio_conference_mixer.target.linux-mips.mk
index 5893b3a..68f2c3c 100644
--- a/modules/audio_conference_mixer.target.linux-mips.mk
+++ b/modules/audio_conference_mixer.target.linux-mips.mk
@@ -124,6 +124,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -241,6 +242,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_conference_mixer.target.linux-x86.mk b/modules/audio_conference_mixer.target.linux-x86.mk
index ca559ba..819b6d7 100644
--- a/modules/audio_conference_mixer.target.linux-x86.mk
+++ b/modules/audio_conference_mixer.target.linux-x86.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -234,6 +235,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_conference_mixer.target.linux-x86_64.mk b/modules/audio_conference_mixer.target.linux-x86_64.mk
index 5a134b6..d3ce540 100644
--- a/modules/audio_conference_mixer.target.linux-x86_64.mk
+++ b/modules/audio_conference_mixer.target.linux-x86_64.mk
@@ -120,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -232,6 +233,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_device.target.darwin-arm.mk b/modules/audio_device.target.darwin-arm.mk
index 342da52..afce6fa 100644
--- a/modules/audio_device.target.darwin-arm.mk
+++ b/modules/audio_device.target.darwin-arm.mk
@@ -29,7 +29,8 @@
third_party/webrtc/modules/audio_device/audio_device_utility.cc \
third_party/webrtc/modules/audio_device/audio_device_impl.cc \
third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \
- third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc
+ third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \
+ third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc
# Flags passed to both C and C++ files.
@@ -132,6 +133,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -261,6 +263,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_device.target.darwin-arm64.mk b/modules/audio_device.target.darwin-arm64.mk
index 414722e..11c79ae 100644
--- a/modules/audio_device.target.darwin-arm64.mk
+++ b/modules/audio_device.target.darwin-arm64.mk
@@ -29,7 +29,8 @@
third_party/webrtc/modules/audio_device/audio_device_utility.cc \
third_party/webrtc/modules/audio_device/audio_device_impl.cc \
third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \
- third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc
+ third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \
+ third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc
# Flags passed to both C and C++ files.
@@ -119,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -234,6 +236,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_device.target.darwin-mips.mk b/modules/audio_device.target.darwin-mips.mk
index 9deacad..fcd225a 100644
--- a/modules/audio_device.target.darwin-mips.mk
+++ b/modules/audio_device.target.darwin-mips.mk
@@ -29,7 +29,8 @@
third_party/webrtc/modules/audio_device/audio_device_utility.cc \
third_party/webrtc/modules/audio_device/audio_device_impl.cc \
third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \
- third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc
+ third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \
+ third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc
# Flags passed to both C and C++ files.
@@ -127,6 +128,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -251,6 +253,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_device.target.darwin-x86.mk b/modules/audio_device.target.darwin-x86.mk
index 19843d2..ca2ec6f 100644
--- a/modules/audio_device.target.darwin-x86.mk
+++ b/modules/audio_device.target.darwin-x86.mk
@@ -29,7 +29,8 @@
third_party/webrtc/modules/audio_device/audio_device_utility.cc \
third_party/webrtc/modules/audio_device/audio_device_impl.cc \
third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \
- third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc
+ third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \
+ third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc
# Flags passed to both C and C++ files.
@@ -124,6 +125,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -244,6 +246,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_device.target.darwin-x86_64.mk b/modules/audio_device.target.darwin-x86_64.mk
index 2320a98..04c576b 100644
--- a/modules/audio_device.target.darwin-x86_64.mk
+++ b/modules/audio_device.target.darwin-x86_64.mk
@@ -29,7 +29,8 @@
third_party/webrtc/modules/audio_device/audio_device_utility.cc \
third_party/webrtc/modules/audio_device/audio_device_impl.cc \
third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \
- third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc
+ third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \
+ third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc
# Flags passed to both C and C++ files.
@@ -123,6 +124,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -242,6 +244,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_device.target.linux-arm.mk b/modules/audio_device.target.linux-arm.mk
index 342da52..afce6fa 100644
--- a/modules/audio_device.target.linux-arm.mk
+++ b/modules/audio_device.target.linux-arm.mk
@@ -29,7 +29,8 @@
third_party/webrtc/modules/audio_device/audio_device_utility.cc \
third_party/webrtc/modules/audio_device/audio_device_impl.cc \
third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \
- third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc
+ third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \
+ third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc
# Flags passed to both C and C++ files.
@@ -132,6 +133,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -261,6 +263,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_device.target.linux-arm64.mk b/modules/audio_device.target.linux-arm64.mk
index 414722e..11c79ae 100644
--- a/modules/audio_device.target.linux-arm64.mk
+++ b/modules/audio_device.target.linux-arm64.mk
@@ -29,7 +29,8 @@
third_party/webrtc/modules/audio_device/audio_device_utility.cc \
third_party/webrtc/modules/audio_device/audio_device_impl.cc \
third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \
- third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc
+ third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \
+ third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc
# Flags passed to both C and C++ files.
@@ -119,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -234,6 +236,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_device.target.linux-mips.mk b/modules/audio_device.target.linux-mips.mk
index 9deacad..fcd225a 100644
--- a/modules/audio_device.target.linux-mips.mk
+++ b/modules/audio_device.target.linux-mips.mk
@@ -29,7 +29,8 @@
third_party/webrtc/modules/audio_device/audio_device_utility.cc \
third_party/webrtc/modules/audio_device/audio_device_impl.cc \
third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \
- third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc
+ third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \
+ third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc
# Flags passed to both C and C++ files.
@@ -127,6 +128,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -251,6 +253,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_device.target.linux-x86.mk b/modules/audio_device.target.linux-x86.mk
index 19843d2..ca2ec6f 100644
--- a/modules/audio_device.target.linux-x86.mk
+++ b/modules/audio_device.target.linux-x86.mk
@@ -29,7 +29,8 @@
third_party/webrtc/modules/audio_device/audio_device_utility.cc \
third_party/webrtc/modules/audio_device/audio_device_impl.cc \
third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \
- third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc
+ third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \
+ third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc
# Flags passed to both C and C++ files.
@@ -124,6 +125,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -244,6 +246,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_device.target.linux-x86_64.mk b/modules/audio_device.target.linux-x86_64.mk
index 2320a98..04c576b 100644
--- a/modules/audio_device.target.linux-x86_64.mk
+++ b/modules/audio_device.target.linux-x86_64.mk
@@ -29,7 +29,8 @@
third_party/webrtc/modules/audio_device/audio_device_utility.cc \
third_party/webrtc/modules/audio_device/audio_device_impl.cc \
third_party/webrtc/modules/audio_device/dummy/audio_device_dummy.cc \
- third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc
+ third_party/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.cc \
+ third_party/webrtc/modules/audio_device/dummy/file_audio_device.cc
# Flags passed to both C and C++ files.
@@ -123,6 +124,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -242,6 +244,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing.target.darwin-arm.mk b/modules/audio_processing.target.darwin-arm.mk
index d471aa5..1f7c1c9 100644
--- a/modules/audio_processing.target.darwin-arm.mk
+++ b/modules/audio_processing.target.darwin-arm.mk
@@ -159,6 +159,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -290,6 +291,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing.target.darwin-arm64.mk b/modules/audio_processing.target.darwin-arm64.mk
index 29b1487..12d3e68 100644
--- a/modules/audio_processing.target.darwin-arm64.mk
+++ b/modules/audio_processing.target.darwin-arm64.mk
@@ -145,6 +145,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -262,6 +263,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing.target.darwin-mips.mk b/modules/audio_processing.target.darwin-mips.mk
index b32b294..9aa97e1 100644
--- a/modules/audio_processing.target.darwin-mips.mk
+++ b/modules/audio_processing.target.darwin-mips.mk
@@ -155,6 +155,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -281,6 +282,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing.target.darwin-x86.mk b/modules/audio_processing.target.darwin-x86.mk
index 9343d2d..8a9765b 100644
--- a/modules/audio_processing.target.darwin-x86.mk
+++ b/modules/audio_processing.target.darwin-x86.mk
@@ -150,6 +150,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -272,6 +273,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing.target.darwin-x86_64.mk b/modules/audio_processing.target.darwin-x86_64.mk
index 79c8942..c8b84ef 100644
--- a/modules/audio_processing.target.darwin-x86_64.mk
+++ b/modules/audio_processing.target.darwin-x86_64.mk
@@ -149,6 +149,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -270,6 +271,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing.target.linux-arm.mk b/modules/audio_processing.target.linux-arm.mk
index d471aa5..1f7c1c9 100644
--- a/modules/audio_processing.target.linux-arm.mk
+++ b/modules/audio_processing.target.linux-arm.mk
@@ -159,6 +159,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -290,6 +291,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing.target.linux-arm64.mk b/modules/audio_processing.target.linux-arm64.mk
index 29b1487..12d3e68 100644
--- a/modules/audio_processing.target.linux-arm64.mk
+++ b/modules/audio_processing.target.linux-arm64.mk
@@ -145,6 +145,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -262,6 +263,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing.target.linux-mips.mk b/modules/audio_processing.target.linux-mips.mk
index b32b294..9aa97e1 100644
--- a/modules/audio_processing.target.linux-mips.mk
+++ b/modules/audio_processing.target.linux-mips.mk
@@ -155,6 +155,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -281,6 +282,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing.target.linux-x86.mk b/modules/audio_processing.target.linux-x86.mk
index 9343d2d..8a9765b 100644
--- a/modules/audio_processing.target.linux-x86.mk
+++ b/modules/audio_processing.target.linux-x86.mk
@@ -150,6 +150,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -272,6 +273,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing.target.linux-x86_64.mk b/modules/audio_processing.target.linux-x86_64.mk
index 79c8942..c8b84ef 100644
--- a/modules/audio_processing.target.linux-x86_64.mk
+++ b/modules/audio_processing.target.linux-x86_64.mk
@@ -149,6 +149,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -270,6 +271,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk b/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk
index 01bc031..b607f77 100644
--- a/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk
+++ b/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.darwin-arm.mk
@@ -150,6 +150,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -265,6 +266,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.linux-arm.mk b/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.linux-arm.mk
index 01bc031..b607f77 100644
--- a/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.linux-arm.mk
+++ b/modules/audio_processing/gen_aecm_core_neon_offsets_h.target.linux-arm.mk
@@ -150,6 +150,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -265,6 +266,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk b/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk
index bdc0f85..c96e485 100644
--- a/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk
+++ b/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.darwin-arm.mk
@@ -150,6 +150,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -265,6 +266,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.linux-arm.mk b/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.linux-arm.mk
index bdc0f85..c96e485 100644
--- a/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.linux-arm.mk
+++ b/modules/audio_processing/gen_nsx_core_neon_offsets_h.target.linux-arm.mk
@@ -150,6 +150,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -265,6 +266,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing/lib_core_neon_offsets.target.darwin-arm.mk b/modules/audio_processing/lib_core_neon_offsets.target.darwin-arm.mk
index a6aa426..d49c7aa 100644
--- a/modules/audio_processing/lib_core_neon_offsets.target.darwin-arm.mk
+++ b/modules/audio_processing/lib_core_neon_offsets.target.darwin-arm.mk
@@ -122,6 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -237,6 +238,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing/lib_core_neon_offsets.target.linux-arm.mk b/modules/audio_processing/lib_core_neon_offsets.target.linux-arm.mk
index a6aa426..d49c7aa 100644
--- a/modules/audio_processing/lib_core_neon_offsets.target.linux-arm.mk
+++ b/modules/audio_processing/lib_core_neon_offsets.target.linux-arm.mk
@@ -122,6 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -237,6 +238,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing_neon.target.darwin-arm.mk b/modules/audio_processing_neon.target.darwin-arm.mk
index b2a4fd0..5128a74 100644
--- a/modules/audio_processing_neon.target.darwin-arm.mk
+++ b/modules/audio_processing_neon.target.darwin-arm.mk
@@ -131,6 +131,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -256,6 +257,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing_neon.target.linux-arm.mk b/modules/audio_processing_neon.target.linux-arm.mk
index b2a4fd0..5128a74 100644
--- a/modules/audio_processing_neon.target.linux-arm.mk
+++ b/modules/audio_processing_neon.target.linux-arm.mk
@@ -131,6 +131,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -256,6 +257,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing_sse2.target.darwin-x86.mk b/modules/audio_processing_sse2.target.darwin-x86.mk
index 213670e..eeb829c 100644
--- a/modules/audio_processing_sse2.target.darwin-x86.mk
+++ b/modules/audio_processing_sse2.target.darwin-x86.mk
@@ -119,6 +119,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -230,6 +231,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing_sse2.target.darwin-x86_64.mk b/modules/audio_processing_sse2.target.darwin-x86_64.mk
index 783b086..ee3b6d8 100644
--- a/modules/audio_processing_sse2.target.darwin-x86_64.mk
+++ b/modules/audio_processing_sse2.target.darwin-x86_64.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -228,6 +229,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing_sse2.target.linux-x86.mk b/modules/audio_processing_sse2.target.linux-x86.mk
index 213670e..eeb829c 100644
--- a/modules/audio_processing_sse2.target.linux-x86.mk
+++ b/modules/audio_processing_sse2.target.linux-x86.mk
@@ -119,6 +119,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -230,6 +231,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audio_processing_sse2.target.linux-x86_64.mk b/modules/audio_processing_sse2.target.linux-x86_64.mk
index 783b086..ee3b6d8 100644
--- a/modules/audio_processing_sse2.target.linux-x86_64.mk
+++ b/modules/audio_processing_sse2.target.linux-x86_64.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -228,6 +229,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audioproc_debug_proto.target.darwin-arm.mk b/modules/audioproc_debug_proto.target.darwin-arm.mk
index 2d95b42..56ff14b 100644
--- a/modules/audioproc_debug_proto.target.darwin-arm.mk
+++ b/modules/audioproc_debug_proto.target.darwin-arm.mk
@@ -153,6 +153,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -278,6 +279,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audioproc_debug_proto.target.darwin-arm64.mk b/modules/audioproc_debug_proto.target.darwin-arm64.mk
index a7b1ac5..eafc7b7 100644
--- a/modules/audioproc_debug_proto.target.darwin-arm64.mk
+++ b/modules/audioproc_debug_proto.target.darwin-arm64.mk
@@ -140,6 +140,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -251,6 +252,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audioproc_debug_proto.target.darwin-mips.mk b/modules/audioproc_debug_proto.target.darwin-mips.mk
index cb49e17..ce1fc7f 100644
--- a/modules/audioproc_debug_proto.target.darwin-mips.mk
+++ b/modules/audioproc_debug_proto.target.darwin-mips.mk
@@ -148,6 +148,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -268,6 +269,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audioproc_debug_proto.target.darwin-x86.mk b/modules/audioproc_debug_proto.target.darwin-x86.mk
index 012246a..ac7a7ac 100644
--- a/modules/audioproc_debug_proto.target.darwin-x86.mk
+++ b/modules/audioproc_debug_proto.target.darwin-x86.mk
@@ -145,6 +145,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -261,6 +262,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audioproc_debug_proto.target.darwin-x86_64.mk b/modules/audioproc_debug_proto.target.darwin-x86_64.mk
index e0b0b0b..046af59 100644
--- a/modules/audioproc_debug_proto.target.darwin-x86_64.mk
+++ b/modules/audioproc_debug_proto.target.darwin-x86_64.mk
@@ -144,6 +144,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -259,6 +260,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audioproc_debug_proto.target.linux-arm.mk b/modules/audioproc_debug_proto.target.linux-arm.mk
index 2d95b42..56ff14b 100644
--- a/modules/audioproc_debug_proto.target.linux-arm.mk
+++ b/modules/audioproc_debug_proto.target.linux-arm.mk
@@ -153,6 +153,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -278,6 +279,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audioproc_debug_proto.target.linux-arm64.mk b/modules/audioproc_debug_proto.target.linux-arm64.mk
index a7b1ac5..eafc7b7 100644
--- a/modules/audioproc_debug_proto.target.linux-arm64.mk
+++ b/modules/audioproc_debug_proto.target.linux-arm64.mk
@@ -140,6 +140,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -251,6 +252,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audioproc_debug_proto.target.linux-mips.mk b/modules/audioproc_debug_proto.target.linux-mips.mk
index cb49e17..ce1fc7f 100644
--- a/modules/audioproc_debug_proto.target.linux-mips.mk
+++ b/modules/audioproc_debug_proto.target.linux-mips.mk
@@ -148,6 +148,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -268,6 +269,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audioproc_debug_proto.target.linux-x86.mk b/modules/audioproc_debug_proto.target.linux-x86.mk
index 012246a..ac7a7ac 100644
--- a/modules/audioproc_debug_proto.target.linux-x86.mk
+++ b/modules/audioproc_debug_proto.target.linux-x86.mk
@@ -145,6 +145,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -261,6 +262,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/audioproc_debug_proto.target.linux-x86_64.mk b/modules/audioproc_debug_proto.target.linux-x86_64.mk
index e0b0b0b..046af59 100644
--- a/modules/audioproc_debug_proto.target.linux-x86_64.mk
+++ b/modules/audioproc_debug_proto.target.linux-x86_64.mk
@@ -144,6 +144,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -259,6 +260,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/bitrate_controller.target.darwin-arm.mk b/modules/bitrate_controller.target.darwin-arm.mk
index 9ba4960..182b831 100644
--- a/modules/bitrate_controller.target.darwin-arm.mk
+++ b/modules/bitrate_controller.target.darwin-arm.mk
@@ -127,6 +127,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -247,6 +248,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/bitrate_controller.target.darwin-arm64.mk b/modules/bitrate_controller.target.darwin-arm64.mk
index c9124e2..d5d7bd2 100644
--- a/modules/bitrate_controller.target.darwin-arm64.mk
+++ b/modules/bitrate_controller.target.darwin-arm64.mk
@@ -114,6 +114,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -220,6 +221,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/bitrate_controller.target.darwin-mips.mk b/modules/bitrate_controller.target.darwin-mips.mk
index 2a3ef2f..953a114 100644
--- a/modules/bitrate_controller.target.darwin-mips.mk
+++ b/modules/bitrate_controller.target.darwin-mips.mk
@@ -122,6 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -237,6 +238,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/bitrate_controller.target.darwin-x86.mk b/modules/bitrate_controller.target.darwin-x86.mk
index c6c91ec..94acf57 100644
--- a/modules/bitrate_controller.target.darwin-x86.mk
+++ b/modules/bitrate_controller.target.darwin-x86.mk
@@ -119,6 +119,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -230,6 +231,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/bitrate_controller.target.darwin-x86_64.mk b/modules/bitrate_controller.target.darwin-x86_64.mk
index f87e206..19b4940 100644
--- a/modules/bitrate_controller.target.darwin-x86_64.mk
+++ b/modules/bitrate_controller.target.darwin-x86_64.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -228,6 +229,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/bitrate_controller.target.linux-arm.mk b/modules/bitrate_controller.target.linux-arm.mk
index 9ba4960..182b831 100644
--- a/modules/bitrate_controller.target.linux-arm.mk
+++ b/modules/bitrate_controller.target.linux-arm.mk
@@ -127,6 +127,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -247,6 +248,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/bitrate_controller.target.linux-arm64.mk b/modules/bitrate_controller.target.linux-arm64.mk
index c9124e2..d5d7bd2 100644
--- a/modules/bitrate_controller.target.linux-arm64.mk
+++ b/modules/bitrate_controller.target.linux-arm64.mk
@@ -114,6 +114,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -220,6 +221,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/bitrate_controller.target.linux-mips.mk b/modules/bitrate_controller.target.linux-mips.mk
index 2a3ef2f..953a114 100644
--- a/modules/bitrate_controller.target.linux-mips.mk
+++ b/modules/bitrate_controller.target.linux-mips.mk
@@ -122,6 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -237,6 +238,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/bitrate_controller.target.linux-x86.mk b/modules/bitrate_controller.target.linux-x86.mk
index c6c91ec..94acf57 100644
--- a/modules/bitrate_controller.target.linux-x86.mk
+++ b/modules/bitrate_controller.target.linux-x86.mk
@@ -119,6 +119,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -230,6 +231,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/bitrate_controller.target.linux-x86_64.mk b/modules/bitrate_controller.target.linux-x86_64.mk
index f87e206..19b4940 100644
--- a/modules/bitrate_controller.target.linux-x86_64.mk
+++ b/modules/bitrate_controller.target.linux-x86_64.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -228,6 +229,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iLBC.target.darwin-arm.mk b/modules/iLBC.target.darwin-arm.mk
index 19586f8..2ccc303 100644
--- a/modules/iLBC.target.darwin-arm.mk
+++ b/modules/iLBC.target.darwin-arm.mk
@@ -193,6 +193,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -317,6 +318,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iLBC.target.darwin-arm64.mk b/modules/iLBC.target.darwin-arm64.mk
index a4d4756..467bd07 100644
--- a/modules/iLBC.target.darwin-arm64.mk
+++ b/modules/iLBC.target.darwin-arm64.mk
@@ -180,6 +180,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -290,6 +291,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iLBC.target.darwin-mips.mk b/modules/iLBC.target.darwin-mips.mk
index 62448da..dcbcd90 100644
--- a/modules/iLBC.target.darwin-mips.mk
+++ b/modules/iLBC.target.darwin-mips.mk
@@ -188,6 +188,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -307,6 +308,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iLBC.target.darwin-x86.mk b/modules/iLBC.target.darwin-x86.mk
index dd503a7..f922f2e 100644
--- a/modules/iLBC.target.darwin-x86.mk
+++ b/modules/iLBC.target.darwin-x86.mk
@@ -185,6 +185,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -300,6 +301,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iLBC.target.darwin-x86_64.mk b/modules/iLBC.target.darwin-x86_64.mk
index 88df127..736dbbb 100644
--- a/modules/iLBC.target.darwin-x86_64.mk
+++ b/modules/iLBC.target.darwin-x86_64.mk
@@ -184,6 +184,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -298,6 +299,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iLBC.target.linux-arm.mk b/modules/iLBC.target.linux-arm.mk
index 19586f8..2ccc303 100644
--- a/modules/iLBC.target.linux-arm.mk
+++ b/modules/iLBC.target.linux-arm.mk
@@ -193,6 +193,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -317,6 +318,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iLBC.target.linux-arm64.mk b/modules/iLBC.target.linux-arm64.mk
index a4d4756..467bd07 100644
--- a/modules/iLBC.target.linux-arm64.mk
+++ b/modules/iLBC.target.linux-arm64.mk
@@ -180,6 +180,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -290,6 +291,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iLBC.target.linux-mips.mk b/modules/iLBC.target.linux-mips.mk
index 62448da..dcbcd90 100644
--- a/modules/iLBC.target.linux-mips.mk
+++ b/modules/iLBC.target.linux-mips.mk
@@ -188,6 +188,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -307,6 +308,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iLBC.target.linux-x86.mk b/modules/iLBC.target.linux-x86.mk
index dd503a7..f922f2e 100644
--- a/modules/iLBC.target.linux-x86.mk
+++ b/modules/iLBC.target.linux-x86.mk
@@ -185,6 +185,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -300,6 +301,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iLBC.target.linux-x86_64.mk b/modules/iLBC.target.linux-x86_64.mk
index 88df127..736dbbb 100644
--- a/modules/iLBC.target.linux-x86_64.mk
+++ b/modules/iLBC.target.linux-x86_64.mk
@@ -184,6 +184,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -298,6 +299,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSAC.target.darwin-arm.mk b/modules/iSAC.target.darwin-arm.mk
index 0833959..fe77b99 100644
--- a/modules/iSAC.target.darwin-arm.mk
+++ b/modules/iSAC.target.darwin-arm.mk
@@ -152,6 +152,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -276,6 +277,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSAC.target.darwin-arm64.mk b/modules/iSAC.target.darwin-arm64.mk
index e7ea664..d843710 100644
--- a/modules/iSAC.target.darwin-arm64.mk
+++ b/modules/iSAC.target.darwin-arm64.mk
@@ -139,6 +139,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -249,6 +250,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSAC.target.darwin-mips.mk b/modules/iSAC.target.darwin-mips.mk
index 571ba5c..df0ee04 100644
--- a/modules/iSAC.target.darwin-mips.mk
+++ b/modules/iSAC.target.darwin-mips.mk
@@ -147,6 +147,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -266,6 +267,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSAC.target.darwin-x86.mk b/modules/iSAC.target.darwin-x86.mk
index 20c156b..d8b650c 100644
--- a/modules/iSAC.target.darwin-x86.mk
+++ b/modules/iSAC.target.darwin-x86.mk
@@ -144,6 +144,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -259,6 +260,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSAC.target.darwin-x86_64.mk b/modules/iSAC.target.darwin-x86_64.mk
index 00ad557..7e2d669 100644
--- a/modules/iSAC.target.darwin-x86_64.mk
+++ b/modules/iSAC.target.darwin-x86_64.mk
@@ -143,6 +143,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -257,6 +258,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSAC.target.linux-arm.mk b/modules/iSAC.target.linux-arm.mk
index 0833959..fe77b99 100644
--- a/modules/iSAC.target.linux-arm.mk
+++ b/modules/iSAC.target.linux-arm.mk
@@ -152,6 +152,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -276,6 +277,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSAC.target.linux-arm64.mk b/modules/iSAC.target.linux-arm64.mk
index e7ea664..d843710 100644
--- a/modules/iSAC.target.linux-arm64.mk
+++ b/modules/iSAC.target.linux-arm64.mk
@@ -139,6 +139,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -249,6 +250,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSAC.target.linux-mips.mk b/modules/iSAC.target.linux-mips.mk
index 571ba5c..df0ee04 100644
--- a/modules/iSAC.target.linux-mips.mk
+++ b/modules/iSAC.target.linux-mips.mk
@@ -147,6 +147,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -266,6 +267,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSAC.target.linux-x86.mk b/modules/iSAC.target.linux-x86.mk
index 20c156b..d8b650c 100644
--- a/modules/iSAC.target.linux-x86.mk
+++ b/modules/iSAC.target.linux-x86.mk
@@ -144,6 +144,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -259,6 +260,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSAC.target.linux-x86_64.mk b/modules/iSAC.target.linux-x86_64.mk
index 00ad557..7e2d669 100644
--- a/modules/iSAC.target.linux-x86_64.mk
+++ b/modules/iSAC.target.linux-x86_64.mk
@@ -143,6 +143,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -257,6 +258,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSACFix.target.darwin-arm.mk b/modules/iSACFix.target.darwin-arm.mk
index fdf4f11..55aebcf 100644
--- a/modules/iSACFix.target.darwin-arm.mk
+++ b/modules/iSACFix.target.darwin-arm.mk
@@ -150,6 +150,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -275,6 +276,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSACFix.target.darwin-arm64.mk b/modules/iSACFix.target.darwin-arm64.mk
index 5c9f3c0..d94f4bb 100644
--- a/modules/iSACFix.target.darwin-arm64.mk
+++ b/modules/iSACFix.target.darwin-arm64.mk
@@ -137,6 +137,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -248,6 +249,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSACFix.target.darwin-mips.mk b/modules/iSACFix.target.darwin-mips.mk
index 478c9c9..923ac1a 100644
--- a/modules/iSACFix.target.darwin-mips.mk
+++ b/modules/iSACFix.target.darwin-mips.mk
@@ -39,7 +39,6 @@
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/initialize.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c \
- third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c \
@@ -48,7 +47,9 @@
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.c \
- third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c
+ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c \
+ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/filters_mips.c \
+ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c
# Flags passed to both C and C++ files.
@@ -145,6 +146,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -265,6 +267,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSACFix.target.darwin-x86.mk b/modules/iSACFix.target.darwin-x86.mk
index 8449953..ba4eb35 100644
--- a/modules/iSACFix.target.darwin-x86.mk
+++ b/modules/iSACFix.target.darwin-x86.mk
@@ -142,6 +142,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -258,6 +259,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSACFix.target.darwin-x86_64.mk b/modules/iSACFix.target.darwin-x86_64.mk
index 9d14af0..bca3061 100644
--- a/modules/iSACFix.target.darwin-x86_64.mk
+++ b/modules/iSACFix.target.darwin-x86_64.mk
@@ -141,6 +141,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -256,6 +257,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSACFix.target.linux-arm.mk b/modules/iSACFix.target.linux-arm.mk
index fdf4f11..55aebcf 100644
--- a/modules/iSACFix.target.linux-arm.mk
+++ b/modules/iSACFix.target.linux-arm.mk
@@ -150,6 +150,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -275,6 +276,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSACFix.target.linux-arm64.mk b/modules/iSACFix.target.linux-arm64.mk
index 5c9f3c0..d94f4bb 100644
--- a/modules/iSACFix.target.linux-arm64.mk
+++ b/modules/iSACFix.target.linux-arm64.mk
@@ -137,6 +137,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -248,6 +249,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSACFix.target.linux-mips.mk b/modules/iSACFix.target.linux-mips.mk
index 478c9c9..923ac1a 100644
--- a/modules/iSACFix.target.linux-mips.mk
+++ b/modules/iSACFix.target.linux-mips.mk
@@ -39,7 +39,6 @@
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/initialize.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c \
- third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c \
@@ -48,7 +47,9 @@
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.c \
third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.c \
- third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c
+ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c \
+ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/filters_mips.c \
+ third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_mips.c
# Flags passed to both C and C++ files.
@@ -145,6 +146,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -265,6 +267,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSACFix.target.linux-x86.mk b/modules/iSACFix.target.linux-x86.mk
index 8449953..ba4eb35 100644
--- a/modules/iSACFix.target.linux-x86.mk
+++ b/modules/iSACFix.target.linux-x86.mk
@@ -142,6 +142,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -258,6 +259,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/iSACFix.target.linux-x86_64.mk b/modules/iSACFix.target.linux-x86_64.mk
index 9d14af0..bca3061 100644
--- a/modules/iSACFix.target.linux-x86_64.mk
+++ b/modules/iSACFix.target.linux-x86_64.mk
@@ -141,6 +141,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -256,6 +257,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/isac_neon.target.darwin-arm.mk b/modules/isac_neon.target.darwin-arm.mk
index acb9241..56b3568 100644
--- a/modules/isac_neon.target.darwin-arm.mk
+++ b/modules/isac_neon.target.darwin-arm.mk
@@ -132,6 +132,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -257,6 +258,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/isac_neon.target.linux-arm.mk b/modules/isac_neon.target.linux-arm.mk
index acb9241..56b3568 100644
--- a/modules/isac_neon.target.linux-arm.mk
+++ b/modules/isac_neon.target.linux-arm.mk
@@ -132,6 +132,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -257,6 +258,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/media_file.target.darwin-arm.mk b/modules/media_file.target.darwin-arm.mk
index aacd8ef..4ee56c2 100644
--- a/modules/media_file.target.darwin-arm.mk
+++ b/modules/media_file.target.darwin-arm.mk
@@ -128,6 +128,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -250,6 +251,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/media_file.target.darwin-arm64.mk b/modules/media_file.target.darwin-arm64.mk
index 0399e1c..0008a3c 100644
--- a/modules/media_file.target.darwin-arm64.mk
+++ b/modules/media_file.target.darwin-arm64.mk
@@ -115,6 +115,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -223,6 +224,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/media_file.target.darwin-mips.mk b/modules/media_file.target.darwin-mips.mk
index acbff9c..1ada8f8 100644
--- a/modules/media_file.target.darwin-mips.mk
+++ b/modules/media_file.target.darwin-mips.mk
@@ -123,6 +123,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -240,6 +241,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/media_file.target.darwin-x86.mk b/modules/media_file.target.darwin-x86.mk
index 4cf0eb4..a993828 100644
--- a/modules/media_file.target.darwin-x86.mk
+++ b/modules/media_file.target.darwin-x86.mk
@@ -120,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -233,6 +234,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/media_file.target.darwin-x86_64.mk b/modules/media_file.target.darwin-x86_64.mk
index cfbaae1..73cc56a 100644
--- a/modules/media_file.target.darwin-x86_64.mk
+++ b/modules/media_file.target.darwin-x86_64.mk
@@ -119,6 +119,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -231,6 +232,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/media_file.target.linux-arm.mk b/modules/media_file.target.linux-arm.mk
index aacd8ef..4ee56c2 100644
--- a/modules/media_file.target.linux-arm.mk
+++ b/modules/media_file.target.linux-arm.mk
@@ -128,6 +128,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -250,6 +251,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/media_file.target.linux-arm64.mk b/modules/media_file.target.linux-arm64.mk
index 0399e1c..0008a3c 100644
--- a/modules/media_file.target.linux-arm64.mk
+++ b/modules/media_file.target.linux-arm64.mk
@@ -115,6 +115,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -223,6 +224,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/media_file.target.linux-mips.mk b/modules/media_file.target.linux-mips.mk
index acbff9c..1ada8f8 100644
--- a/modules/media_file.target.linux-mips.mk
+++ b/modules/media_file.target.linux-mips.mk
@@ -123,6 +123,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -240,6 +241,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/media_file.target.linux-x86.mk b/modules/media_file.target.linux-x86.mk
index 4cf0eb4..a993828 100644
--- a/modules/media_file.target.linux-x86.mk
+++ b/modules/media_file.target.linux-x86.mk
@@ -120,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -233,6 +234,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/media_file.target.linux-x86_64.mk b/modules/media_file.target.linux-x86_64.mk
index cfbaae1..73cc56a 100644
--- a/modules/media_file.target.linux-x86_64.mk
+++ b/modules/media_file.target.linux-x86_64.mk
@@ -119,6 +119,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -231,6 +232,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/NetEq4.target.darwin-arm.mk b/modules/neteq.target.darwin-arm.mk
similarity index 80%
rename from modules/NetEq4.target.darwin-arm.mk
rename to modules/neteq.target.darwin-arm.mk
index 96e5b55..5735810 100644
--- a/modules/NetEq4.target.darwin-arm.mk
+++ b/modules/neteq.target.darwin-arm.mk
@@ -3,7 +3,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp
+LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp
LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
@@ -24,39 +24,39 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
- third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/merge.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \
- third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \
- third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \
- third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \
- third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc
+ third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/merge.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq.cc \
+ third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \
+ third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \
+ third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \
+ third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc
# Flags passed to both C and C++ files.
@@ -159,6 +159,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -294,6 +295,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -384,10 +386,10 @@
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
-gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp
+gyp_all_modules: third_party_webrtc_modules_neteq_gyp
# Alias gyp target name.
-.PHONY: NetEq4
-NetEq4: third_party_webrtc_modules_NetEq4_gyp
+.PHONY: neteq
+neteq: third_party_webrtc_modules_neteq_gyp
include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/NetEq4.target.darwin-arm64.mk b/modules/neteq.target.darwin-arm64.mk
similarity index 79%
rename from modules/NetEq4.target.darwin-arm64.mk
rename to modules/neteq.target.darwin-arm64.mk
index 5f9620b..4e247a8 100644
--- a/modules/NetEq4.target.darwin-arm64.mk
+++ b/modules/neteq.target.darwin-arm64.mk
@@ -3,7 +3,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp
+LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp
LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
@@ -24,39 +24,39 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
- third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/merge.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \
- third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \
- third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \
- third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \
- third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc
+ third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/merge.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq.cc \
+ third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \
+ third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \
+ third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \
+ third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc
# Flags passed to both C and C++ files.
@@ -146,6 +146,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -267,6 +268,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -348,10 +350,10 @@
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
-gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp
+gyp_all_modules: third_party_webrtc_modules_neteq_gyp
# Alias gyp target name.
-.PHONY: NetEq4
-NetEq4: third_party_webrtc_modules_NetEq4_gyp
+.PHONY: neteq
+neteq: third_party_webrtc_modules_neteq_gyp
include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/NetEq4.target.darwin-mips.mk b/modules/neteq.target.darwin-mips.mk
similarity index 79%
rename from modules/NetEq4.target.darwin-mips.mk
rename to modules/neteq.target.darwin-mips.mk
index 13f5d25..124c532 100644
--- a/modules/NetEq4.target.darwin-mips.mk
+++ b/modules/neteq.target.darwin-mips.mk
@@ -3,7 +3,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp
+LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp
LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
@@ -24,39 +24,39 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
- third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/merge.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \
- third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \
- third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \
- third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \
- third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc
+ third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/merge.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq.cc \
+ third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \
+ third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \
+ third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \
+ third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc
# Flags passed to both C and C++ files.
@@ -154,6 +154,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -284,6 +285,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -370,10 +372,10 @@
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
-gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp
+gyp_all_modules: third_party_webrtc_modules_neteq_gyp
# Alias gyp target name.
-.PHONY: NetEq4
-NetEq4: third_party_webrtc_modules_NetEq4_gyp
+.PHONY: neteq
+neteq: third_party_webrtc_modules_neteq_gyp
include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/NetEq4.target.darwin-x86.mk b/modules/neteq.target.darwin-x86.mk
similarity index 79%
rename from modules/NetEq4.target.darwin-x86.mk
rename to modules/neteq.target.darwin-x86.mk
index 0f95630..4f8c2dd 100644
--- a/modules/NetEq4.target.darwin-x86.mk
+++ b/modules/neteq.target.darwin-x86.mk
@@ -3,7 +3,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp
+LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp
LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
@@ -24,39 +24,39 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
- third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/merge.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \
- third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \
- third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \
- third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \
- third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc
+ third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/merge.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq.cc \
+ third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \
+ third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \
+ third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \
+ third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc
# Flags passed to both C and C++ files.
@@ -151,6 +151,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -277,6 +278,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -362,10 +364,10 @@
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
-gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp
+gyp_all_modules: third_party_webrtc_modules_neteq_gyp
# Alias gyp target name.
-.PHONY: NetEq4
-NetEq4: third_party_webrtc_modules_NetEq4_gyp
+.PHONY: neteq
+neteq: third_party_webrtc_modules_neteq_gyp
include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/NetEq4.target.darwin-x86_64.mk b/modules/neteq.target.darwin-x86_64.mk
similarity index 79%
rename from modules/NetEq4.target.darwin-x86_64.mk
rename to modules/neteq.target.darwin-x86_64.mk
index 01f3668..6d3cf52 100644
--- a/modules/NetEq4.target.darwin-x86_64.mk
+++ b/modules/neteq.target.darwin-x86_64.mk
@@ -3,7 +3,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp
+LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp
LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
@@ -24,39 +24,39 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
- third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/merge.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \
- third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \
- third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \
- third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \
- third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc
+ third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/merge.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq.cc \
+ third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \
+ third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \
+ third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \
+ third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc
# Flags passed to both C and C++ files.
@@ -150,6 +150,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -275,6 +276,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -360,10 +362,10 @@
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
-gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp
+gyp_all_modules: third_party_webrtc_modules_neteq_gyp
# Alias gyp target name.
-.PHONY: NetEq4
-NetEq4: third_party_webrtc_modules_NetEq4_gyp
+.PHONY: neteq
+neteq: third_party_webrtc_modules_neteq_gyp
include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/NetEq4.target.darwin-arm.mk b/modules/neteq.target.linux-arm.mk
similarity index 80%
copy from modules/NetEq4.target.darwin-arm.mk
copy to modules/neteq.target.linux-arm.mk
index 96e5b55..5735810 100644
--- a/modules/NetEq4.target.darwin-arm.mk
+++ b/modules/neteq.target.linux-arm.mk
@@ -3,7 +3,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp
+LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp
LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
@@ -24,39 +24,39 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
- third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/merge.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \
- third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \
- third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \
- third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \
- third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc
+ third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/merge.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq.cc \
+ third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \
+ third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \
+ third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \
+ third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc
# Flags passed to both C and C++ files.
@@ -159,6 +159,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -294,6 +295,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -384,10 +386,10 @@
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
-gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp
+gyp_all_modules: third_party_webrtc_modules_neteq_gyp
# Alias gyp target name.
-.PHONY: NetEq4
-NetEq4: third_party_webrtc_modules_NetEq4_gyp
+.PHONY: neteq
+neteq: third_party_webrtc_modules_neteq_gyp
include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/NetEq4.target.darwin-arm64.mk b/modules/neteq.target.linux-arm64.mk
similarity index 79%
copy from modules/NetEq4.target.darwin-arm64.mk
copy to modules/neteq.target.linux-arm64.mk
index 5f9620b..4e247a8 100644
--- a/modules/NetEq4.target.darwin-arm64.mk
+++ b/modules/neteq.target.linux-arm64.mk
@@ -3,7 +3,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp
+LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp
LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
@@ -24,39 +24,39 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
- third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/merge.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \
- third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \
- third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \
- third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \
- third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc
+ third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/merge.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq.cc \
+ third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \
+ third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \
+ third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \
+ third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc
# Flags passed to both C and C++ files.
@@ -146,6 +146,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -267,6 +268,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -348,10 +350,10 @@
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
-gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp
+gyp_all_modules: third_party_webrtc_modules_neteq_gyp
# Alias gyp target name.
-.PHONY: NetEq4
-NetEq4: third_party_webrtc_modules_NetEq4_gyp
+.PHONY: neteq
+neteq: third_party_webrtc_modules_neteq_gyp
include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/NetEq4.target.darwin-mips.mk b/modules/neteq.target.linux-mips.mk
similarity index 79%
copy from modules/NetEq4.target.darwin-mips.mk
copy to modules/neteq.target.linux-mips.mk
index 13f5d25..124c532 100644
--- a/modules/NetEq4.target.darwin-mips.mk
+++ b/modules/neteq.target.linux-mips.mk
@@ -3,7 +3,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp
+LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp
LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
@@ -24,39 +24,39 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
- third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/merge.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \
- third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \
- third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \
- third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \
- third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc
+ third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/merge.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq.cc \
+ third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \
+ third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \
+ third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \
+ third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc
# Flags passed to both C and C++ files.
@@ -154,6 +154,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -284,6 +285,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -370,10 +372,10 @@
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
-gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp
+gyp_all_modules: third_party_webrtc_modules_neteq_gyp
# Alias gyp target name.
-.PHONY: NetEq4
-NetEq4: third_party_webrtc_modules_NetEq4_gyp
+.PHONY: neteq
+neteq: third_party_webrtc_modules_neteq_gyp
include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/NetEq4.target.darwin-x86.mk b/modules/neteq.target.linux-x86.mk
similarity index 79%
copy from modules/NetEq4.target.darwin-x86.mk
copy to modules/neteq.target.linux-x86.mk
index 0f95630..4f8c2dd 100644
--- a/modules/NetEq4.target.darwin-x86.mk
+++ b/modules/neteq.target.linux-x86.mk
@@ -3,7 +3,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp
+LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp
LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
@@ -24,39 +24,39 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
- third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/merge.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \
- third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \
- third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \
- third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \
- third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc
+ third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/merge.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq.cc \
+ third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \
+ third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \
+ third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \
+ third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc
# Flags passed to both C and C++ files.
@@ -151,6 +151,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -277,6 +278,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -362,10 +364,10 @@
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
-gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp
+gyp_all_modules: third_party_webrtc_modules_neteq_gyp
# Alias gyp target name.
-.PHONY: NetEq4
-NetEq4: third_party_webrtc_modules_NetEq4_gyp
+.PHONY: neteq
+neteq: third_party_webrtc_modules_neteq_gyp
include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/NetEq4.target.darwin-x86_64.mk b/modules/neteq.target.linux-x86_64.mk
similarity index 79%
copy from modules/NetEq4.target.darwin-x86_64.mk
copy to modules/neteq.target.linux-x86_64.mk
index 01f3668..6d3cf52 100644
--- a/modules/NetEq4.target.darwin-x86_64.mk
+++ b/modules/neteq.target.linux-x86_64.mk
@@ -3,7 +3,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_webrtc_modules_NetEq4_gyp
+LOCAL_MODULE := third_party_webrtc_modules_neteq_gyp
LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
@@ -24,39 +24,39 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
- third_party/webrtc/modules/audio_coding/neteq4/accelerate.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_classifier.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_decoder.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_multi_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/audio_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/background_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/buffer_level_filter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/comfort_noise.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_fax.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decision_logic_normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/decoder_database.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_manager.cc \
- third_party/webrtc/modules/audio_coding/neteq4/delay_peak_detector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dsp_helper.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/merge.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq_impl.cc \
- third_party/webrtc/modules/audio_coding/neteq4/neteq.cc \
- third_party/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc \
- third_party/webrtc/modules/audio_coding/neteq4/normal.cc \
- third_party/webrtc/modules/audio_coding/neteq4/packet_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/payload_splitter.cc \
- third_party/webrtc/modules/audio_coding/neteq4/post_decode_vad.cc \
- third_party/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc \
- third_party/webrtc/modules/audio_coding/neteq4/random_vector.cc \
- third_party/webrtc/modules/audio_coding/neteq4/rtcp.cc \
- third_party/webrtc/modules/audio_coding/neteq4/sync_buffer.cc \
- third_party/webrtc/modules/audio_coding/neteq4/timestamp_scaler.cc \
- third_party/webrtc/modules/audio_coding/neteq4/time_stretch.cc
+ third_party/webrtc/modules/audio_coding/neteq/accelerate.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_classifier.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_decoder.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_multi_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/audio_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/background_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/buffer_level_filter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/comfort_noise.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_fax.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/decoder_database.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_manager.cc \
+ third_party/webrtc/modules/audio_coding/neteq/delay_peak_detector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dsp_helper.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/merge.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq_impl.cc \
+ third_party/webrtc/modules/audio_coding/neteq/neteq.cc \
+ third_party/webrtc/modules/audio_coding/neteq/statistics_calculator.cc \
+ third_party/webrtc/modules/audio_coding/neteq/normal.cc \
+ third_party/webrtc/modules/audio_coding/neteq/packet_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/payload_splitter.cc \
+ third_party/webrtc/modules/audio_coding/neteq/post_decode_vad.cc \
+ third_party/webrtc/modules/audio_coding/neteq/preemptive_expand.cc \
+ third_party/webrtc/modules/audio_coding/neteq/random_vector.cc \
+ third_party/webrtc/modules/audio_coding/neteq/rtcp.cc \
+ third_party/webrtc/modules/audio_coding/neteq/sync_buffer.cc \
+ third_party/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc \
+ third_party/webrtc/modules/audio_coding/neteq/time_stretch.cc
# Flags passed to both C and C++ files.
@@ -150,6 +150,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -275,6 +276,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -360,10 +362,10 @@
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
-gyp_all_modules: third_party_webrtc_modules_NetEq4_gyp
+gyp_all_modules: third_party_webrtc_modules_neteq_gyp
# Alias gyp target name.
-.PHONY: NetEq4
-NetEq4: third_party_webrtc_modules_NetEq4_gyp
+.PHONY: neteq
+neteq: third_party_webrtc_modules_neteq_gyp
include $(BUILD_STATIC_LIBRARY)
diff --git a/modules/paced_sender.target.darwin-arm.mk b/modules/paced_sender.target.darwin-arm.mk
index c426770..113cff0 100644
--- a/modules/paced_sender.target.darwin-arm.mk
+++ b/modules/paced_sender.target.darwin-arm.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -246,6 +247,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/paced_sender.target.darwin-arm64.mk b/modules/paced_sender.target.darwin-arm64.mk
index 229400b..aff9431 100644
--- a/modules/paced_sender.target.darwin-arm64.mk
+++ b/modules/paced_sender.target.darwin-arm64.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -219,6 +220,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/paced_sender.target.darwin-mips.mk b/modules/paced_sender.target.darwin-mips.mk
index 11b6d8c..c0bdb72 100644
--- a/modules/paced_sender.target.darwin-mips.mk
+++ b/modules/paced_sender.target.darwin-mips.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -236,6 +237,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/paced_sender.target.darwin-x86.mk b/modules/paced_sender.target.darwin-x86.mk
index 1117243..dbd81ae 100644
--- a/modules/paced_sender.target.darwin-x86.mk
+++ b/modules/paced_sender.target.darwin-x86.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -229,6 +230,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/paced_sender.target.darwin-x86_64.mk b/modules/paced_sender.target.darwin-x86_64.mk
index aac7d25..29b232c 100644
--- a/modules/paced_sender.target.darwin-x86_64.mk
+++ b/modules/paced_sender.target.darwin-x86_64.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -227,6 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/paced_sender.target.linux-arm.mk b/modules/paced_sender.target.linux-arm.mk
index c426770..113cff0 100644
--- a/modules/paced_sender.target.linux-arm.mk
+++ b/modules/paced_sender.target.linux-arm.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -246,6 +247,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/paced_sender.target.linux-arm64.mk b/modules/paced_sender.target.linux-arm64.mk
index 229400b..aff9431 100644
--- a/modules/paced_sender.target.linux-arm64.mk
+++ b/modules/paced_sender.target.linux-arm64.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -219,6 +220,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/paced_sender.target.linux-mips.mk b/modules/paced_sender.target.linux-mips.mk
index 11b6d8c..c0bdb72 100644
--- a/modules/paced_sender.target.linux-mips.mk
+++ b/modules/paced_sender.target.linux-mips.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -236,6 +237,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/paced_sender.target.linux-x86.mk b/modules/paced_sender.target.linux-x86.mk
index 1117243..dbd81ae 100644
--- a/modules/paced_sender.target.linux-x86.mk
+++ b/modules/paced_sender.target.linux-x86.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -229,6 +230,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/paced_sender.target.linux-x86_64.mk b/modules/paced_sender.target.linux-x86_64.mk
index aac7d25..29b232c 100644
--- a/modules/paced_sender.target.linux-x86_64.mk
+++ b/modules/paced_sender.target.linux-x86_64.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -227,6 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator.target.darwin-arm.mk b/modules/remote_bitrate_estimator.target.darwin-arm.mk
index 5de27c0..e531eb0 100644
--- a/modules/remote_bitrate_estimator.target.darwin-arm.mk
+++ b/modules/remote_bitrate_estimator.target.darwin-arm.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -246,6 +247,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator.target.darwin-arm64.mk b/modules/remote_bitrate_estimator.target.darwin-arm64.mk
index e7e4152..ff731d5 100644
--- a/modules/remote_bitrate_estimator.target.darwin-arm64.mk
+++ b/modules/remote_bitrate_estimator.target.darwin-arm64.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -219,6 +220,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator.target.darwin-mips.mk b/modules/remote_bitrate_estimator.target.darwin-mips.mk
index afa2aac..4f247a9 100644
--- a/modules/remote_bitrate_estimator.target.darwin-mips.mk
+++ b/modules/remote_bitrate_estimator.target.darwin-mips.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -236,6 +237,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator.target.darwin-x86.mk b/modules/remote_bitrate_estimator.target.darwin-x86.mk
index 91c7dc4..0c14694 100644
--- a/modules/remote_bitrate_estimator.target.darwin-x86.mk
+++ b/modules/remote_bitrate_estimator.target.darwin-x86.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -229,6 +230,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator.target.darwin-x86_64.mk b/modules/remote_bitrate_estimator.target.darwin-x86_64.mk
index 9524ee1..b5fb9ea 100644
--- a/modules/remote_bitrate_estimator.target.darwin-x86_64.mk
+++ b/modules/remote_bitrate_estimator.target.darwin-x86_64.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -227,6 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator.target.linux-arm.mk b/modules/remote_bitrate_estimator.target.linux-arm.mk
index 5de27c0..e531eb0 100644
--- a/modules/remote_bitrate_estimator.target.linux-arm.mk
+++ b/modules/remote_bitrate_estimator.target.linux-arm.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -246,6 +247,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator.target.linux-arm64.mk b/modules/remote_bitrate_estimator.target.linux-arm64.mk
index e7e4152..ff731d5 100644
--- a/modules/remote_bitrate_estimator.target.linux-arm64.mk
+++ b/modules/remote_bitrate_estimator.target.linux-arm64.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -219,6 +220,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator.target.linux-mips.mk b/modules/remote_bitrate_estimator.target.linux-mips.mk
index afa2aac..4f247a9 100644
--- a/modules/remote_bitrate_estimator.target.linux-mips.mk
+++ b/modules/remote_bitrate_estimator.target.linux-mips.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -236,6 +237,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator.target.linux-x86.mk b/modules/remote_bitrate_estimator.target.linux-x86.mk
index 91c7dc4..0c14694 100644
--- a/modules/remote_bitrate_estimator.target.linux-x86.mk
+++ b/modules/remote_bitrate_estimator.target.linux-x86.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -229,6 +230,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator.target.linux-x86_64.mk b/modules/remote_bitrate_estimator.target.linux-x86_64.mk
index 9524ee1..b5fb9ea 100644
--- a/modules/remote_bitrate_estimator.target.linux-x86_64.mk
+++ b/modules/remote_bitrate_estimator.target.linux-x86_64.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -227,6 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm.mk b/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm.mk
index e0274a8..7ef8738 100644
--- a/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm.mk
+++ b/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm.mk
@@ -124,6 +124,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -239,6 +240,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm64.mk b/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm64.mk
index 51a1d11..62cfeca 100644
--- a/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm64.mk
+++ b/modules/remote_bitrate_estimator/rbe_components.target.darwin-arm64.mk
@@ -111,6 +111,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -212,6 +213,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator/rbe_components.target.darwin-mips.mk b/modules/remote_bitrate_estimator/rbe_components.target.darwin-mips.mk
index c95dc71..5aa92d0 100644
--- a/modules/remote_bitrate_estimator/rbe_components.target.darwin-mips.mk
+++ b/modules/remote_bitrate_estimator/rbe_components.target.darwin-mips.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -227,6 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86.mk b/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86.mk
index 9c37d56..991bf15 100644
--- a/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86.mk
+++ b/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86.mk
@@ -116,6 +116,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -222,6 +223,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86_64.mk b/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86_64.mk
index 6e83427..482c136 100644
--- a/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86_64.mk
+++ b/modules/remote_bitrate_estimator/rbe_components.target.darwin-x86_64.mk
@@ -115,6 +115,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -220,6 +221,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator/rbe_components.target.linux-arm.mk b/modules/remote_bitrate_estimator/rbe_components.target.linux-arm.mk
index e0274a8..7ef8738 100644
--- a/modules/remote_bitrate_estimator/rbe_components.target.linux-arm.mk
+++ b/modules/remote_bitrate_estimator/rbe_components.target.linux-arm.mk
@@ -124,6 +124,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -239,6 +240,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator/rbe_components.target.linux-arm64.mk b/modules/remote_bitrate_estimator/rbe_components.target.linux-arm64.mk
index 51a1d11..62cfeca 100644
--- a/modules/remote_bitrate_estimator/rbe_components.target.linux-arm64.mk
+++ b/modules/remote_bitrate_estimator/rbe_components.target.linux-arm64.mk
@@ -111,6 +111,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -212,6 +213,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator/rbe_components.target.linux-mips.mk b/modules/remote_bitrate_estimator/rbe_components.target.linux-mips.mk
index c95dc71..5aa92d0 100644
--- a/modules/remote_bitrate_estimator/rbe_components.target.linux-mips.mk
+++ b/modules/remote_bitrate_estimator/rbe_components.target.linux-mips.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -227,6 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator/rbe_components.target.linux-x86.mk b/modules/remote_bitrate_estimator/rbe_components.target.linux-x86.mk
index 9c37d56..991bf15 100644
--- a/modules/remote_bitrate_estimator/rbe_components.target.linux-x86.mk
+++ b/modules/remote_bitrate_estimator/rbe_components.target.linux-x86.mk
@@ -116,6 +116,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -222,6 +223,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/remote_bitrate_estimator/rbe_components.target.linux-x86_64.mk b/modules/remote_bitrate_estimator/rbe_components.target.linux-x86_64.mk
index 6e83427..482c136 100644
--- a/modules/remote_bitrate_estimator/rbe_components.target.linux-x86_64.mk
+++ b/modules/remote_bitrate_estimator/rbe_components.target.linux-x86_64.mk
@@ -115,6 +115,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -220,6 +221,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/rtp_rtcp.target.darwin-arm.mk b/modules/rtp_rtcp.target.darwin-arm.mk
index 5f08e97..67a9e40 100644
--- a/modules/rtp_rtcp.target.darwin-arm.mk
+++ b/modules/rtp_rtcp.target.darwin-arm.mk
@@ -155,6 +155,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -275,6 +276,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/rtp_rtcp.target.darwin-arm64.mk b/modules/rtp_rtcp.target.darwin-arm64.mk
index 62d6f8c..0f1f311 100644
--- a/modules/rtp_rtcp.target.darwin-arm64.mk
+++ b/modules/rtp_rtcp.target.darwin-arm64.mk
@@ -142,6 +142,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -248,6 +249,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/rtp_rtcp.target.darwin-mips.mk b/modules/rtp_rtcp.target.darwin-mips.mk
index 10898a7..5d87d71 100644
--- a/modules/rtp_rtcp.target.darwin-mips.mk
+++ b/modules/rtp_rtcp.target.darwin-mips.mk
@@ -150,6 +150,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -265,6 +266,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/rtp_rtcp.target.darwin-x86.mk b/modules/rtp_rtcp.target.darwin-x86.mk
index 89a365f..fadd466 100644
--- a/modules/rtp_rtcp.target.darwin-x86.mk
+++ b/modules/rtp_rtcp.target.darwin-x86.mk
@@ -147,6 +147,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -258,6 +259,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/rtp_rtcp.target.darwin-x86_64.mk b/modules/rtp_rtcp.target.darwin-x86_64.mk
index d8502dc..dc3ad83 100644
--- a/modules/rtp_rtcp.target.darwin-x86_64.mk
+++ b/modules/rtp_rtcp.target.darwin-x86_64.mk
@@ -146,6 +146,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -256,6 +257,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/rtp_rtcp.target.linux-arm.mk b/modules/rtp_rtcp.target.linux-arm.mk
index 5f08e97..67a9e40 100644
--- a/modules/rtp_rtcp.target.linux-arm.mk
+++ b/modules/rtp_rtcp.target.linux-arm.mk
@@ -155,6 +155,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -275,6 +276,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/rtp_rtcp.target.linux-arm64.mk b/modules/rtp_rtcp.target.linux-arm64.mk
index 62d6f8c..0f1f311 100644
--- a/modules/rtp_rtcp.target.linux-arm64.mk
+++ b/modules/rtp_rtcp.target.linux-arm64.mk
@@ -142,6 +142,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -248,6 +249,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/rtp_rtcp.target.linux-mips.mk b/modules/rtp_rtcp.target.linux-mips.mk
index 10898a7..5d87d71 100644
--- a/modules/rtp_rtcp.target.linux-mips.mk
+++ b/modules/rtp_rtcp.target.linux-mips.mk
@@ -150,6 +150,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -265,6 +266,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/rtp_rtcp.target.linux-x86.mk b/modules/rtp_rtcp.target.linux-x86.mk
index 89a365f..fadd466 100644
--- a/modules/rtp_rtcp.target.linux-x86.mk
+++ b/modules/rtp_rtcp.target.linux-x86.mk
@@ -147,6 +147,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -258,6 +259,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/rtp_rtcp.target.linux-x86_64.mk b/modules/rtp_rtcp.target.linux-x86_64.mk
index d8502dc..dc3ad83 100644
--- a/modules/rtp_rtcp.target.linux-x86_64.mk
+++ b/modules/rtp_rtcp.target.linux-x86_64.mk
@@ -146,6 +146,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -256,6 +257,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_capture_module.target.darwin-arm.mk b/modules/video_capture_module.target.darwin-arm.mk
index e1ab742..2ce68b7 100644
--- a/modules/video_capture_module.target.darwin-arm.mk
+++ b/modules/video_capture_module.target.darwin-arm.mk
@@ -130,6 +130,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -252,6 +253,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_capture_module.target.darwin-arm64.mk b/modules/video_capture_module.target.darwin-arm64.mk
index 2ac9427..b95713d 100644
--- a/modules/video_capture_module.target.darwin-arm64.mk
+++ b/modules/video_capture_module.target.darwin-arm64.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -225,6 +226,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_capture_module.target.darwin-mips.mk b/modules/video_capture_module.target.darwin-mips.mk
index 37c8a0d..c65396c 100644
--- a/modules/video_capture_module.target.darwin-mips.mk
+++ b/modules/video_capture_module.target.darwin-mips.mk
@@ -125,6 +125,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -242,6 +243,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_capture_module.target.darwin-x86.mk b/modules/video_capture_module.target.darwin-x86.mk
index 260bbfd..f62c716 100644
--- a/modules/video_capture_module.target.darwin-x86.mk
+++ b/modules/video_capture_module.target.darwin-x86.mk
@@ -122,6 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -235,6 +236,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_capture_module.target.darwin-x86_64.mk b/modules/video_capture_module.target.darwin-x86_64.mk
index 347d16c..ae511a0 100644
--- a/modules/video_capture_module.target.darwin-x86_64.mk
+++ b/modules/video_capture_module.target.darwin-x86_64.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -233,6 +234,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_capture_module.target.linux-arm.mk b/modules/video_capture_module.target.linux-arm.mk
index e1ab742..2ce68b7 100644
--- a/modules/video_capture_module.target.linux-arm.mk
+++ b/modules/video_capture_module.target.linux-arm.mk
@@ -130,6 +130,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -252,6 +253,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_capture_module.target.linux-arm64.mk b/modules/video_capture_module.target.linux-arm64.mk
index 2ac9427..b95713d 100644
--- a/modules/video_capture_module.target.linux-arm64.mk
+++ b/modules/video_capture_module.target.linux-arm64.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -225,6 +226,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_capture_module.target.linux-mips.mk b/modules/video_capture_module.target.linux-mips.mk
index 37c8a0d..c65396c 100644
--- a/modules/video_capture_module.target.linux-mips.mk
+++ b/modules/video_capture_module.target.linux-mips.mk
@@ -125,6 +125,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -242,6 +243,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_capture_module.target.linux-x86.mk b/modules/video_capture_module.target.linux-x86.mk
index 260bbfd..f62c716 100644
--- a/modules/video_capture_module.target.linux-x86.mk
+++ b/modules/video_capture_module.target.linux-x86.mk
@@ -122,6 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -235,6 +236,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_capture_module.target.linux-x86_64.mk b/modules/video_capture_module.target.linux-x86_64.mk
index 347d16c..ae511a0 100644
--- a/modules/video_capture_module.target.linux-x86_64.mk
+++ b/modules/video_capture_module.target.linux-x86_64.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -233,6 +234,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk
index 92787e1..7050b1c 100644
--- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk
+++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -245,6 +246,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm64.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm64.mk
index 3a021a9..0cfc3ab 100644
--- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm64.mk
+++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-arm64.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -218,6 +219,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-mips.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-mips.mk
index a1f689f..570eb31 100644
--- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-mips.mk
+++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-mips.mk
@@ -120,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -233,6 +234,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86.mk
index 839548f..27b1c3a 100644
--- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86.mk
+++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -228,6 +229,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86_64.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86_64.mk
index fb4892c..c7fc9be 100644
--- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86_64.mk
+++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.darwin-x86_64.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -226,6 +227,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm.mk
index 92787e1..7050b1c 100644
--- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm.mk
+++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -245,6 +246,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm64.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm64.mk
index 3a021a9..0cfc3ab 100644
--- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm64.mk
+++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-arm64.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -218,6 +219,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-mips.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-mips.mk
index a1f689f..570eb31 100644
--- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-mips.mk
+++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-mips.mk
@@ -120,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -233,6 +234,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86.mk
index 839548f..27b1c3a 100644
--- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86.mk
+++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -228,6 +229,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86_64.mk b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86_64.mk
index fb4892c..c7fc9be 100644
--- a/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86_64.mk
+++ b/modules/video_coding/codecs/vp8/webrtc_vp8.target.linux-x86_64.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -226,6 +227,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk
index 5a9577c..b3ddd7f 100644
--- a/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk
+++ b/modules/video_coding/utility/video_coding_utility.target.darwin-arm.mk
@@ -123,6 +123,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -239,6 +240,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/utility/video_coding_utility.target.darwin-arm64.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-arm64.mk
index d19d118..c14e11a 100644
--- a/modules/video_coding/utility/video_coding_utility.target.darwin-arm64.mk
+++ b/modules/video_coding/utility/video_coding_utility.target.darwin-arm64.mk
@@ -110,6 +110,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -212,6 +213,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/utility/video_coding_utility.target.darwin-mips.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-mips.mk
index 1b5cd75..bfd617f 100644
--- a/modules/video_coding/utility/video_coding_utility.target.darwin-mips.mk
+++ b/modules/video_coding/utility/video_coding_utility.target.darwin-mips.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -227,6 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/utility/video_coding_utility.target.darwin-x86.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-x86.mk
index e3a9bc2..1e41003 100644
--- a/modules/video_coding/utility/video_coding_utility.target.darwin-x86.mk
+++ b/modules/video_coding/utility/video_coding_utility.target.darwin-x86.mk
@@ -115,6 +115,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -222,6 +223,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/utility/video_coding_utility.target.darwin-x86_64.mk b/modules/video_coding/utility/video_coding_utility.target.darwin-x86_64.mk
index af95f81..44aa4f9 100644
--- a/modules/video_coding/utility/video_coding_utility.target.darwin-x86_64.mk
+++ b/modules/video_coding/utility/video_coding_utility.target.darwin-x86_64.mk
@@ -114,6 +114,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -220,6 +221,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/utility/video_coding_utility.target.linux-arm.mk b/modules/video_coding/utility/video_coding_utility.target.linux-arm.mk
index 5a9577c..b3ddd7f 100644
--- a/modules/video_coding/utility/video_coding_utility.target.linux-arm.mk
+++ b/modules/video_coding/utility/video_coding_utility.target.linux-arm.mk
@@ -123,6 +123,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -239,6 +240,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/utility/video_coding_utility.target.linux-arm64.mk b/modules/video_coding/utility/video_coding_utility.target.linux-arm64.mk
index d19d118..c14e11a 100644
--- a/modules/video_coding/utility/video_coding_utility.target.linux-arm64.mk
+++ b/modules/video_coding/utility/video_coding_utility.target.linux-arm64.mk
@@ -110,6 +110,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -212,6 +213,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/utility/video_coding_utility.target.linux-mips.mk b/modules/video_coding/utility/video_coding_utility.target.linux-mips.mk
index 1b5cd75..bfd617f 100644
--- a/modules/video_coding/utility/video_coding_utility.target.linux-mips.mk
+++ b/modules/video_coding/utility/video_coding_utility.target.linux-mips.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -227,6 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/utility/video_coding_utility.target.linux-x86.mk b/modules/video_coding/utility/video_coding_utility.target.linux-x86.mk
index e3a9bc2..1e41003 100644
--- a/modules/video_coding/utility/video_coding_utility.target.linux-x86.mk
+++ b/modules/video_coding/utility/video_coding_utility.target.linux-x86.mk
@@ -115,6 +115,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -222,6 +223,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk b/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk
index af95f81..44aa4f9 100644
--- a/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk
+++ b/modules/video_coding/utility/video_coding_utility.target.linux-x86_64.mk
@@ -114,6 +114,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -220,6 +221,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_processing.target.darwin-arm.mk b/modules/video_processing.target.darwin-arm.mk
index f01d312..8cd6c3b 100644
--- a/modules/video_processing.target.darwin-arm.mk
+++ b/modules/video_processing.target.darwin-arm.mk
@@ -135,6 +135,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -260,6 +261,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_processing.target.darwin-arm64.mk b/modules/video_processing.target.darwin-arm64.mk
index 3813200..8da8b99 100644
--- a/modules/video_processing.target.darwin-arm64.mk
+++ b/modules/video_processing.target.darwin-arm64.mk
@@ -122,6 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -233,6 +234,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_processing.target.darwin-mips.mk b/modules/video_processing.target.darwin-mips.mk
index 41d8f1b..5b64e82 100644
--- a/modules/video_processing.target.darwin-mips.mk
+++ b/modules/video_processing.target.darwin-mips.mk
@@ -130,6 +130,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -250,6 +251,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_processing.target.darwin-x86.mk b/modules/video_processing.target.darwin-x86.mk
index 38705fc..e1c8322 100644
--- a/modules/video_processing.target.darwin-x86.mk
+++ b/modules/video_processing.target.darwin-x86.mk
@@ -127,6 +127,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -243,6 +244,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_processing.target.darwin-x86_64.mk b/modules/video_processing.target.darwin-x86_64.mk
index ef8f87e..257fe31 100644
--- a/modules/video_processing.target.darwin-x86_64.mk
+++ b/modules/video_processing.target.darwin-x86_64.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -241,6 +242,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_processing.target.linux-arm.mk b/modules/video_processing.target.linux-arm.mk
index f01d312..8cd6c3b 100644
--- a/modules/video_processing.target.linux-arm.mk
+++ b/modules/video_processing.target.linux-arm.mk
@@ -135,6 +135,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -260,6 +261,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_processing.target.linux-arm64.mk b/modules/video_processing.target.linux-arm64.mk
index 3813200..8da8b99 100644
--- a/modules/video_processing.target.linux-arm64.mk
+++ b/modules/video_processing.target.linux-arm64.mk
@@ -122,6 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -233,6 +234,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_processing.target.linux-mips.mk b/modules/video_processing.target.linux-mips.mk
index 41d8f1b..5b64e82 100644
--- a/modules/video_processing.target.linux-mips.mk
+++ b/modules/video_processing.target.linux-mips.mk
@@ -130,6 +130,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -250,6 +251,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_processing.target.linux-x86.mk b/modules/video_processing.target.linux-x86.mk
index 38705fc..e1c8322 100644
--- a/modules/video_processing.target.linux-x86.mk
+++ b/modules/video_processing.target.linux-x86.mk
@@ -127,6 +127,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -243,6 +244,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_processing.target.linux-x86_64.mk b/modules/video_processing.target.linux-x86_64.mk
index ef8f87e..257fe31 100644
--- a/modules/video_processing.target.linux-x86_64.mk
+++ b/modules/video_processing.target.linux-x86_64.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -241,6 +242,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_processing_sse2.target.darwin-x86.mk b/modules/video_processing_sse2.target.darwin-x86.mk
index 6473ff5..b8287a8 100644
--- a/modules/video_processing_sse2.target.darwin-x86.mk
+++ b/modules/video_processing_sse2.target.darwin-x86.mk
@@ -119,6 +119,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -230,6 +231,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_processing_sse2.target.darwin-x86_64.mk b/modules/video_processing_sse2.target.darwin-x86_64.mk
index 7425f3d..2aae993 100644
--- a/modules/video_processing_sse2.target.darwin-x86_64.mk
+++ b/modules/video_processing_sse2.target.darwin-x86_64.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -228,6 +229,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_processing_sse2.target.linux-x86.mk b/modules/video_processing_sse2.target.linux-x86.mk
index 6473ff5..b8287a8 100644
--- a/modules/video_processing_sse2.target.linux-x86.mk
+++ b/modules/video_processing_sse2.target.linux-x86.mk
@@ -119,6 +119,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -230,6 +231,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_processing_sse2.target.linux-x86_64.mk b/modules/video_processing_sse2.target.linux-x86_64.mk
index 7425f3d..2aae993 100644
--- a/modules/video_processing_sse2.target.linux-x86_64.mk
+++ b/modules/video_processing_sse2.target.linux-x86_64.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -228,6 +229,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_render_module.target.darwin-arm.mk b/modules/video_render_module.target.darwin-arm.mk
index 496bd0e..00ddc8d 100644
--- a/modules/video_render_module.target.darwin-arm.mk
+++ b/modules/video_render_module.target.darwin-arm.mk
@@ -129,6 +129,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -251,6 +252,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_render_module.target.darwin-arm64.mk b/modules/video_render_module.target.darwin-arm64.mk
index a7a6434..000ec7f 100644
--- a/modules/video_render_module.target.darwin-arm64.mk
+++ b/modules/video_render_module.target.darwin-arm64.mk
@@ -116,6 +116,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -224,6 +225,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_render_module.target.darwin-mips.mk b/modules/video_render_module.target.darwin-mips.mk
index 66f41fd..d01e5a9 100644
--- a/modules/video_render_module.target.darwin-mips.mk
+++ b/modules/video_render_module.target.darwin-mips.mk
@@ -124,6 +124,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -241,6 +242,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_render_module.target.darwin-x86.mk b/modules/video_render_module.target.darwin-x86.mk
index d3f7e65..c5797f7 100644
--- a/modules/video_render_module.target.darwin-x86.mk
+++ b/modules/video_render_module.target.darwin-x86.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -234,6 +235,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_render_module.target.darwin-x86_64.mk b/modules/video_render_module.target.darwin-x86_64.mk
index 29ca401..88ef855 100644
--- a/modules/video_render_module.target.darwin-x86_64.mk
+++ b/modules/video_render_module.target.darwin-x86_64.mk
@@ -120,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -232,6 +233,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_render_module.target.linux-arm.mk b/modules/video_render_module.target.linux-arm.mk
index 496bd0e..00ddc8d 100644
--- a/modules/video_render_module.target.linux-arm.mk
+++ b/modules/video_render_module.target.linux-arm.mk
@@ -129,6 +129,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -251,6 +252,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_render_module.target.linux-arm64.mk b/modules/video_render_module.target.linux-arm64.mk
index a7a6434..000ec7f 100644
--- a/modules/video_render_module.target.linux-arm64.mk
+++ b/modules/video_render_module.target.linux-arm64.mk
@@ -116,6 +116,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -224,6 +225,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_render_module.target.linux-mips.mk b/modules/video_render_module.target.linux-mips.mk
index 66f41fd..d01e5a9 100644
--- a/modules/video_render_module.target.linux-mips.mk
+++ b/modules/video_render_module.target.linux-mips.mk
@@ -124,6 +124,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -241,6 +242,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_render_module.target.linux-x86.mk b/modules/video_render_module.target.linux-x86.mk
index d3f7e65..c5797f7 100644
--- a/modules/video_render_module.target.linux-x86.mk
+++ b/modules/video_render_module.target.linux-x86.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -234,6 +235,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/video_render_module.target.linux-x86_64.mk b/modules/video_render_module.target.linux-x86_64.mk
index 29ca401..88ef855 100644
--- a/modules/video_render_module.target.linux-x86_64.mk
+++ b/modules/video_render_module.target.linux-x86_64.mk
@@ -120,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -232,6 +233,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_i420.target.darwin-arm.mk b/modules/webrtc_i420.target.darwin-arm.mk
index 0023b4e..ce889df 100644
--- a/modules/webrtc_i420.target.darwin-arm.mk
+++ b/modules/webrtc_i420.target.darwin-arm.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -246,6 +247,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_i420.target.darwin-arm64.mk b/modules/webrtc_i420.target.darwin-arm64.mk
index f9cc72e..539fb98 100644
--- a/modules/webrtc_i420.target.darwin-arm64.mk
+++ b/modules/webrtc_i420.target.darwin-arm64.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -219,6 +220,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_i420.target.darwin-mips.mk b/modules/webrtc_i420.target.darwin-mips.mk
index 2af7e85..43a7a15 100644
--- a/modules/webrtc_i420.target.darwin-mips.mk
+++ b/modules/webrtc_i420.target.darwin-mips.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -236,6 +237,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_i420.target.darwin-x86.mk b/modules/webrtc_i420.target.darwin-x86.mk
index 962df1d..8533400 100644
--- a/modules/webrtc_i420.target.darwin-x86.mk
+++ b/modules/webrtc_i420.target.darwin-x86.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -229,6 +230,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_i420.target.darwin-x86_64.mk b/modules/webrtc_i420.target.darwin-x86_64.mk
index 431ac88..6ac95fa 100644
--- a/modules/webrtc_i420.target.darwin-x86_64.mk
+++ b/modules/webrtc_i420.target.darwin-x86_64.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -227,6 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_i420.target.linux-arm.mk b/modules/webrtc_i420.target.linux-arm.mk
index 0023b4e..ce889df 100644
--- a/modules/webrtc_i420.target.linux-arm.mk
+++ b/modules/webrtc_i420.target.linux-arm.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -246,6 +247,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_i420.target.linux-arm64.mk b/modules/webrtc_i420.target.linux-arm64.mk
index f9cc72e..539fb98 100644
--- a/modules/webrtc_i420.target.linux-arm64.mk
+++ b/modules/webrtc_i420.target.linux-arm64.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -219,6 +220,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_i420.target.linux-mips.mk b/modules/webrtc_i420.target.linux-mips.mk
index 2af7e85..43a7a15 100644
--- a/modules/webrtc_i420.target.linux-mips.mk
+++ b/modules/webrtc_i420.target.linux-mips.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -236,6 +237,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_i420.target.linux-x86.mk b/modules/webrtc_i420.target.linux-x86.mk
index 962df1d..8533400 100644
--- a/modules/webrtc_i420.target.linux-x86.mk
+++ b/modules/webrtc_i420.target.linux-x86.mk
@@ -118,6 +118,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -229,6 +230,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_i420.target.linux-x86_64.mk b/modules/webrtc_i420.target.linux-x86_64.mk
index 431ac88..6ac95fa 100644
--- a/modules/webrtc_i420.target.linux-x86_64.mk
+++ b/modules/webrtc_i420.target.linux-x86_64.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -227,6 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_opus.target.darwin-arm.mk b/modules/webrtc_opus.target.darwin-arm.mk
index 26b21aa..f8ab0b6 100644
--- a/modules/webrtc_opus.target.darwin-arm.mk
+++ b/modules/webrtc_opus.target.darwin-arm.mk
@@ -125,6 +125,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -246,6 +247,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_opus.target.darwin-arm64.mk b/modules/webrtc_opus.target.darwin-arm64.mk
index 0220429..24335c1 100644
--- a/modules/webrtc_opus.target.darwin-arm64.mk
+++ b/modules/webrtc_opus.target.darwin-arm64.mk
@@ -112,6 +112,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -219,6 +220,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_opus.target.darwin-mips.mk b/modules/webrtc_opus.target.darwin-mips.mk
index 060fee5..c281e3f 100644
--- a/modules/webrtc_opus.target.darwin-mips.mk
+++ b/modules/webrtc_opus.target.darwin-mips.mk
@@ -120,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -236,6 +237,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_opus.target.darwin-x86.mk b/modules/webrtc_opus.target.darwin-x86.mk
index f80cd40..7f2bd86 100644
--- a/modules/webrtc_opus.target.darwin-x86.mk
+++ b/modules/webrtc_opus.target.darwin-x86.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -229,6 +230,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_opus.target.darwin-x86_64.mk b/modules/webrtc_opus.target.darwin-x86_64.mk
index 73292c3..267cd53 100644
--- a/modules/webrtc_opus.target.darwin-x86_64.mk
+++ b/modules/webrtc_opus.target.darwin-x86_64.mk
@@ -116,6 +116,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -227,6 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_opus.target.linux-arm.mk b/modules/webrtc_opus.target.linux-arm.mk
index 26b21aa..f8ab0b6 100644
--- a/modules/webrtc_opus.target.linux-arm.mk
+++ b/modules/webrtc_opus.target.linux-arm.mk
@@ -125,6 +125,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -246,6 +247,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_opus.target.linux-arm64.mk b/modules/webrtc_opus.target.linux-arm64.mk
index 0220429..24335c1 100644
--- a/modules/webrtc_opus.target.linux-arm64.mk
+++ b/modules/webrtc_opus.target.linux-arm64.mk
@@ -112,6 +112,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -219,6 +220,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_opus.target.linux-mips.mk b/modules/webrtc_opus.target.linux-mips.mk
index 060fee5..c281e3f 100644
--- a/modules/webrtc_opus.target.linux-mips.mk
+++ b/modules/webrtc_opus.target.linux-mips.mk
@@ -120,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -236,6 +237,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_opus.target.linux-x86.mk b/modules/webrtc_opus.target.linux-x86.mk
index f80cd40..7f2bd86 100644
--- a/modules/webrtc_opus.target.linux-x86.mk
+++ b/modules/webrtc_opus.target.linux-x86.mk
@@ -117,6 +117,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -229,6 +230,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_opus.target.linux-x86_64.mk b/modules/webrtc_opus.target.linux-x86_64.mk
index 73292c3..267cd53 100644
--- a/modules/webrtc_opus.target.linux-x86_64.mk
+++ b/modules/webrtc_opus.target.linux-x86_64.mk
@@ -116,6 +116,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -227,6 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_utility.target.darwin-arm.mk b/modules/webrtc_utility.target.darwin-arm.mk
index d41b1e9..9482c50 100644
--- a/modules/webrtc_utility.target.darwin-arm.mk
+++ b/modules/webrtc_utility.target.darwin-arm.mk
@@ -135,6 +135,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -262,6 +263,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_utility.target.darwin-arm64.mk b/modules/webrtc_utility.target.darwin-arm64.mk
index f7c0801..cf53ddb 100644
--- a/modules/webrtc_utility.target.darwin-arm64.mk
+++ b/modules/webrtc_utility.target.darwin-arm64.mk
@@ -122,6 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -235,6 +236,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_utility.target.darwin-mips.mk b/modules/webrtc_utility.target.darwin-mips.mk
index 6161108..9c64aab 100644
--- a/modules/webrtc_utility.target.darwin-mips.mk
+++ b/modules/webrtc_utility.target.darwin-mips.mk
@@ -130,6 +130,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -252,6 +253,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_utility.target.darwin-x86.mk b/modules/webrtc_utility.target.darwin-x86.mk
index 7a3f02d..5e92212 100644
--- a/modules/webrtc_utility.target.darwin-x86.mk
+++ b/modules/webrtc_utility.target.darwin-x86.mk
@@ -127,6 +127,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -245,6 +246,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_utility.target.darwin-x86_64.mk b/modules/webrtc_utility.target.darwin-x86_64.mk
index fa453f6..ab94f40 100644
--- a/modules/webrtc_utility.target.darwin-x86_64.mk
+++ b/modules/webrtc_utility.target.darwin-x86_64.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -243,6 +244,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_utility.target.linux-arm.mk b/modules/webrtc_utility.target.linux-arm.mk
index d41b1e9..9482c50 100644
--- a/modules/webrtc_utility.target.linux-arm.mk
+++ b/modules/webrtc_utility.target.linux-arm.mk
@@ -135,6 +135,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -262,6 +263,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_utility.target.linux-arm64.mk b/modules/webrtc_utility.target.linux-arm64.mk
index f7c0801..cf53ddb 100644
--- a/modules/webrtc_utility.target.linux-arm64.mk
+++ b/modules/webrtc_utility.target.linux-arm64.mk
@@ -122,6 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -235,6 +236,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_utility.target.linux-mips.mk b/modules/webrtc_utility.target.linux-mips.mk
index 6161108..9c64aab 100644
--- a/modules/webrtc_utility.target.linux-mips.mk
+++ b/modules/webrtc_utility.target.linux-mips.mk
@@ -130,6 +130,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -252,6 +253,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_utility.target.linux-x86.mk b/modules/webrtc_utility.target.linux-x86.mk
index 7a3f02d..5e92212 100644
--- a/modules/webrtc_utility.target.linux-x86.mk
+++ b/modules/webrtc_utility.target.linux-x86.mk
@@ -127,6 +127,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -245,6 +246,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_utility.target.linux-x86_64.mk b/modules/webrtc_utility.target.linux-x86_64.mk
index fa453f6..ab94f40 100644
--- a/modules/webrtc_utility.target.linux-x86_64.mk
+++ b/modules/webrtc_utility.target.linux-x86_64.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -243,6 +244,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_video_coding.target.darwin-arm.mk b/modules/webrtc_video_coding.target.darwin-arm.mk
index 3452fd1..854686e 100644
--- a/modules/webrtc_video_coding.target.darwin-arm.mk
+++ b/modules/webrtc_video_coding.target.darwin-arm.mk
@@ -148,6 +148,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -270,6 +271,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_video_coding.target.darwin-arm64.mk b/modules/webrtc_video_coding.target.darwin-arm64.mk
index bc7daa8..cbd8f74 100644
--- a/modules/webrtc_video_coding.target.darwin-arm64.mk
+++ b/modules/webrtc_video_coding.target.darwin-arm64.mk
@@ -135,6 +135,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -243,6 +244,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_video_coding.target.darwin-mips.mk b/modules/webrtc_video_coding.target.darwin-mips.mk
index 12841aa..93ccba9 100644
--- a/modules/webrtc_video_coding.target.darwin-mips.mk
+++ b/modules/webrtc_video_coding.target.darwin-mips.mk
@@ -143,6 +143,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -260,6 +261,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_video_coding.target.darwin-x86.mk b/modules/webrtc_video_coding.target.darwin-x86.mk
index 81d3c81..c1cb7d8 100644
--- a/modules/webrtc_video_coding.target.darwin-x86.mk
+++ b/modules/webrtc_video_coding.target.darwin-x86.mk
@@ -140,6 +140,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -253,6 +254,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_video_coding.target.darwin-x86_64.mk b/modules/webrtc_video_coding.target.darwin-x86_64.mk
index 1778ddb..f4bec2c 100644
--- a/modules/webrtc_video_coding.target.darwin-x86_64.mk
+++ b/modules/webrtc_video_coding.target.darwin-x86_64.mk
@@ -139,6 +139,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -251,6 +252,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_video_coding.target.linux-arm.mk b/modules/webrtc_video_coding.target.linux-arm.mk
index 3452fd1..854686e 100644
--- a/modules/webrtc_video_coding.target.linux-arm.mk
+++ b/modules/webrtc_video_coding.target.linux-arm.mk
@@ -148,6 +148,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -270,6 +271,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_video_coding.target.linux-arm64.mk b/modules/webrtc_video_coding.target.linux-arm64.mk
index bc7daa8..cbd8f74 100644
--- a/modules/webrtc_video_coding.target.linux-arm64.mk
+++ b/modules/webrtc_video_coding.target.linux-arm64.mk
@@ -135,6 +135,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -243,6 +244,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_video_coding.target.linux-mips.mk b/modules/webrtc_video_coding.target.linux-mips.mk
index 12841aa..93ccba9 100644
--- a/modules/webrtc_video_coding.target.linux-mips.mk
+++ b/modules/webrtc_video_coding.target.linux-mips.mk
@@ -143,6 +143,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -260,6 +261,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_video_coding.target.linux-x86.mk b/modules/webrtc_video_coding.target.linux-x86.mk
index 81d3c81..c1cb7d8 100644
--- a/modules/webrtc_video_coding.target.linux-x86.mk
+++ b/modules/webrtc_video_coding.target.linux-x86.mk
@@ -140,6 +140,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -253,6 +254,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/modules/webrtc_video_coding.target.linux-x86_64.mk b/modules/webrtc_video_coding.target.linux-x86_64.mk
index 1778ddb..f4bec2c 100644
--- a/modules/webrtc_video_coding.target.linux-x86_64.mk
+++ b/modules/webrtc_video_coding.target.linux-x86_64.mk
@@ -139,6 +139,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -251,6 +252,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/cpu_features_android.target.darwin-arm.mk b/system_wrappers/source/cpu_features_android.target.darwin-arm.mk
index 087b03e..ba1cce9 100644
--- a/system_wrappers/source/cpu_features_android.target.darwin-arm.mk
+++ b/system_wrappers/source/cpu_features_android.target.darwin-arm.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -236,6 +237,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/cpu_features_android.target.darwin-arm64.mk b/system_wrappers/source/cpu_features_android.target.darwin-arm64.mk
index 15b019d..ad35520 100644
--- a/system_wrappers/source/cpu_features_android.target.darwin-arm64.mk
+++ b/system_wrappers/source/cpu_features_android.target.darwin-arm64.mk
@@ -108,6 +108,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -209,6 +210,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/cpu_features_android.target.darwin-mips.mk b/system_wrappers/source/cpu_features_android.target.darwin-mips.mk
index 7ee8c35..63d21f2 100644
--- a/system_wrappers/source/cpu_features_android.target.darwin-mips.mk
+++ b/system_wrappers/source/cpu_features_android.target.darwin-mips.mk
@@ -115,6 +115,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -224,6 +225,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/cpu_features_android.target.darwin-x86.mk b/system_wrappers/source/cpu_features_android.target.darwin-x86.mk
index 73c46d9..a5c12e8 100644
--- a/system_wrappers/source/cpu_features_android.target.darwin-x86.mk
+++ b/system_wrappers/source/cpu_features_android.target.darwin-x86.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -219,6 +220,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk b/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk
index ddfc3a3..a8536e9 100644
--- a/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk
+++ b/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk
@@ -112,6 +112,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -217,6 +218,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/cpu_features_android.target.linux-arm.mk b/system_wrappers/source/cpu_features_android.target.linux-arm.mk
index 087b03e..ba1cce9 100644
--- a/system_wrappers/source/cpu_features_android.target.linux-arm.mk
+++ b/system_wrappers/source/cpu_features_android.target.linux-arm.mk
@@ -121,6 +121,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -236,6 +237,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/cpu_features_android.target.linux-arm64.mk b/system_wrappers/source/cpu_features_android.target.linux-arm64.mk
index 15b019d..ad35520 100644
--- a/system_wrappers/source/cpu_features_android.target.linux-arm64.mk
+++ b/system_wrappers/source/cpu_features_android.target.linux-arm64.mk
@@ -108,6 +108,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -209,6 +210,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/cpu_features_android.target.linux-mips.mk b/system_wrappers/source/cpu_features_android.target.linux-mips.mk
index 7ee8c35..63d21f2 100644
--- a/system_wrappers/source/cpu_features_android.target.linux-mips.mk
+++ b/system_wrappers/source/cpu_features_android.target.linux-mips.mk
@@ -115,6 +115,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -224,6 +225,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/cpu_features_android.target.linux-x86.mk b/system_wrappers/source/cpu_features_android.target.linux-x86.mk
index 73c46d9..a5c12e8 100644
--- a/system_wrappers/source/cpu_features_android.target.linux-x86.mk
+++ b/system_wrappers/source/cpu_features_android.target.linux-x86.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -219,6 +220,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/cpu_features_android.target.linux-x86_64.mk b/system_wrappers/source/cpu_features_android.target.linux-x86_64.mk
index ddfc3a3..a8536e9 100644
--- a/system_wrappers/source/cpu_features_android.target.linux-x86_64.mk
+++ b/system_wrappers/source/cpu_features_android.target.linux-x86_64.mk
@@ -112,6 +112,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -217,6 +218,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/system_wrappers.target.darwin-arm.mk b/system_wrappers/source/system_wrappers.target.darwin-arm.mk
index a5758f7..3969684 100644
--- a/system_wrappers/source/system_wrappers.target.darwin-arm.mk
+++ b/system_wrappers/source/system_wrappers.target.darwin-arm.mk
@@ -158,6 +158,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -283,6 +284,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/system_wrappers.target.darwin-arm64.mk b/system_wrappers/source/system_wrappers.target.darwin-arm64.mk
index 97b1e64..731eab8 100644
--- a/system_wrappers/source/system_wrappers.target.darwin-arm64.mk
+++ b/system_wrappers/source/system_wrappers.target.darwin-arm64.mk
@@ -145,6 +145,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -256,6 +257,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/system_wrappers.target.darwin-mips.mk b/system_wrappers/source/system_wrappers.target.darwin-mips.mk
index 1331061..1aeeb63 100644
--- a/system_wrappers/source/system_wrappers.target.darwin-mips.mk
+++ b/system_wrappers/source/system_wrappers.target.darwin-mips.mk
@@ -152,6 +152,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -271,6 +272,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/system_wrappers.target.darwin-x86.mk b/system_wrappers/source/system_wrappers.target.darwin-x86.mk
index b200279..a2d3d73 100644
--- a/system_wrappers/source/system_wrappers.target.darwin-x86.mk
+++ b/system_wrappers/source/system_wrappers.target.darwin-x86.mk
@@ -150,6 +150,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -266,6 +267,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk b/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk
index d59ff03..b9d521d 100644
--- a/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk
+++ b/system_wrappers/source/system_wrappers.target.darwin-x86_64.mk
@@ -149,6 +149,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -264,6 +265,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/system_wrappers.target.linux-arm.mk b/system_wrappers/source/system_wrappers.target.linux-arm.mk
index a5758f7..3969684 100644
--- a/system_wrappers/source/system_wrappers.target.linux-arm.mk
+++ b/system_wrappers/source/system_wrappers.target.linux-arm.mk
@@ -158,6 +158,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -283,6 +284,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/system_wrappers.target.linux-arm64.mk b/system_wrappers/source/system_wrappers.target.linux-arm64.mk
index 97b1e64..731eab8 100644
--- a/system_wrappers/source/system_wrappers.target.linux-arm64.mk
+++ b/system_wrappers/source/system_wrappers.target.linux-arm64.mk
@@ -145,6 +145,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -256,6 +257,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/system_wrappers.target.linux-mips.mk b/system_wrappers/source/system_wrappers.target.linux-mips.mk
index 1331061..1aeeb63 100644
--- a/system_wrappers/source/system_wrappers.target.linux-mips.mk
+++ b/system_wrappers/source/system_wrappers.target.linux-mips.mk
@@ -152,6 +152,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -271,6 +272,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/system_wrappers.target.linux-x86.mk b/system_wrappers/source/system_wrappers.target.linux-x86.mk
index b200279..a2d3d73 100644
--- a/system_wrappers/source/system_wrappers.target.linux-x86.mk
+++ b/system_wrappers/source/system_wrappers.target.linux-x86.mk
@@ -150,6 +150,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -266,6 +267,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/system_wrappers/source/system_wrappers.target.linux-x86_64.mk b/system_wrappers/source/system_wrappers.target.linux-x86_64.mk
index d59ff03..b9d521d 100644
--- a/system_wrappers/source/system_wrappers.target.linux-x86_64.mk
+++ b/system_wrappers/source/system_wrappers.target.linux-x86_64.mk
@@ -149,6 +149,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -264,6 +265,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/video_engine/video_engine_core.target.darwin-arm.mk b/video_engine/video_engine_core.target.darwin-arm.mk
index 9609ca1..7e7e15d 100644
--- a/video_engine/video_engine_core.target.darwin-arm.mk
+++ b/video_engine/video_engine_core.target.darwin-arm.mk
@@ -151,6 +151,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -269,6 +270,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/video_engine/video_engine_core.target.darwin-arm64.mk b/video_engine/video_engine_core.target.darwin-arm64.mk
index 71740a4..4f2208c 100644
--- a/video_engine/video_engine_core.target.darwin-arm64.mk
+++ b/video_engine/video_engine_core.target.darwin-arm64.mk
@@ -138,6 +138,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -242,6 +243,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/video_engine/video_engine_core.target.darwin-mips.mk b/video_engine/video_engine_core.target.darwin-mips.mk
index 9a27a24..3971e70 100644
--- a/video_engine/video_engine_core.target.darwin-mips.mk
+++ b/video_engine/video_engine_core.target.darwin-mips.mk
@@ -145,6 +145,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -257,6 +258,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/video_engine/video_engine_core.target.darwin-x86.mk b/video_engine/video_engine_core.target.darwin-x86.mk
index 196b915..726e770 100644
--- a/video_engine/video_engine_core.target.darwin-x86.mk
+++ b/video_engine/video_engine_core.target.darwin-x86.mk
@@ -143,6 +143,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -252,6 +253,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/video_engine/video_engine_core.target.darwin-x86_64.mk b/video_engine/video_engine_core.target.darwin-x86_64.mk
index 764789a..fdc3919 100644
--- a/video_engine/video_engine_core.target.darwin-x86_64.mk
+++ b/video_engine/video_engine_core.target.darwin-x86_64.mk
@@ -142,6 +142,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -250,6 +251,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/video_engine/video_engine_core.target.linux-arm.mk b/video_engine/video_engine_core.target.linux-arm.mk
index 9609ca1..7e7e15d 100644
--- a/video_engine/video_engine_core.target.linux-arm.mk
+++ b/video_engine/video_engine_core.target.linux-arm.mk
@@ -151,6 +151,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -269,6 +270,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/video_engine/video_engine_core.target.linux-arm64.mk b/video_engine/video_engine_core.target.linux-arm64.mk
index 71740a4..4f2208c 100644
--- a/video_engine/video_engine_core.target.linux-arm64.mk
+++ b/video_engine/video_engine_core.target.linux-arm64.mk
@@ -138,6 +138,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -242,6 +243,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/video_engine/video_engine_core.target.linux-mips.mk b/video_engine/video_engine_core.target.linux-mips.mk
index 9a27a24..3971e70 100644
--- a/video_engine/video_engine_core.target.linux-mips.mk
+++ b/video_engine/video_engine_core.target.linux-mips.mk
@@ -145,6 +145,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -257,6 +258,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/video_engine/video_engine_core.target.linux-x86.mk b/video_engine/video_engine_core.target.linux-x86.mk
index 196b915..726e770 100644
--- a/video_engine/video_engine_core.target.linux-x86.mk
+++ b/video_engine/video_engine_core.target.linux-x86.mk
@@ -143,6 +143,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -252,6 +253,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/video_engine/video_engine_core.target.linux-x86_64.mk b/video_engine/video_engine_core.target.linux-x86_64.mk
index 764789a..fdc3919 100644
--- a/video_engine/video_engine_core.target.linux-x86_64.mk
+++ b/video_engine/video_engine_core.target.linux-x86_64.mk
@@ -142,6 +142,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -250,6 +251,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/voice_engine/voice_engine.target.darwin-arm.mk b/voice_engine/voice_engine.target.darwin-arm.mk
index d4328e9..fb22fe3 100644
--- a/voice_engine/voice_engine.target.darwin-arm.mk
+++ b/voice_engine/voice_engine.target.darwin-arm.mk
@@ -145,6 +145,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -270,6 +271,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/voice_engine/voice_engine.target.darwin-arm64.mk b/voice_engine/voice_engine.target.darwin-arm64.mk
index 39d6725..e60ca85 100644
--- a/voice_engine/voice_engine.target.darwin-arm64.mk
+++ b/voice_engine/voice_engine.target.darwin-arm64.mk
@@ -132,6 +132,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -243,6 +244,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/voice_engine/voice_engine.target.darwin-mips.mk b/voice_engine/voice_engine.target.darwin-mips.mk
index f4fc8f1..c505e51 100644
--- a/voice_engine/voice_engine.target.darwin-mips.mk
+++ b/voice_engine/voice_engine.target.darwin-mips.mk
@@ -139,6 +139,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -258,6 +259,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/voice_engine/voice_engine.target.darwin-x86.mk b/voice_engine/voice_engine.target.darwin-x86.mk
index 1ebaa73..2f39989 100644
--- a/voice_engine/voice_engine.target.darwin-x86.mk
+++ b/voice_engine/voice_engine.target.darwin-x86.mk
@@ -137,6 +137,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -253,6 +254,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/voice_engine/voice_engine.target.darwin-x86_64.mk b/voice_engine/voice_engine.target.darwin-x86_64.mk
index d7b75d2..861ea41 100644
--- a/voice_engine/voice_engine.target.darwin-x86_64.mk
+++ b/voice_engine/voice_engine.target.darwin-x86_64.mk
@@ -136,6 +136,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -251,6 +252,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/voice_engine/voice_engine.target.linux-arm.mk b/voice_engine/voice_engine.target.linux-arm.mk
index d4328e9..fb22fe3 100644
--- a/voice_engine/voice_engine.target.linux-arm.mk
+++ b/voice_engine/voice_engine.target.linux-arm.mk
@@ -145,6 +145,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -270,6 +271,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/voice_engine/voice_engine.target.linux-arm64.mk b/voice_engine/voice_engine.target.linux-arm64.mk
index 39d6725..e60ca85 100644
--- a/voice_engine/voice_engine.target.linux-arm64.mk
+++ b/voice_engine/voice_engine.target.linux-arm64.mk
@@ -132,6 +132,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -243,6 +244,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/voice_engine/voice_engine.target.linux-mips.mk b/voice_engine/voice_engine.target.linux-mips.mk
index f4fc8f1..c505e51 100644
--- a/voice_engine/voice_engine.target.linux-mips.mk
+++ b/voice_engine/voice_engine.target.linux-mips.mk
@@ -139,6 +139,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -258,6 +259,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/voice_engine/voice_engine.target.linux-x86.mk b/voice_engine/voice_engine.target.linux-x86.mk
index 1ebaa73..2f39989 100644
--- a/voice_engine/voice_engine.target.linux-x86.mk
+++ b/voice_engine/voice_engine.target.linux-x86.mk
@@ -137,6 +137,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -253,6 +254,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/voice_engine/voice_engine.target.linux-x86_64.mk b/voice_engine/voice_engine.target.linux-x86_64.mk
index d7b75d2..861ea41 100644
--- a/voice_engine/voice_engine.target.linux-x86_64.mk
+++ b/voice_engine/voice_engine.target.linux-x86_64.mk
@@ -136,6 +136,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -251,6 +252,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc.target.darwin-arm.mk b/webrtc.target.darwin-arm.mk
index 4fa9f8c..fd6eac7 100644
--- a/webrtc.target.darwin-arm.mk
+++ b/webrtc.target.darwin-arm.mk
@@ -128,6 +128,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -243,6 +244,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc.target.darwin-arm64.mk b/webrtc.target.darwin-arm64.mk
index 7f52171..21bdd79 100644
--- a/webrtc.target.darwin-arm64.mk
+++ b/webrtc.target.darwin-arm64.mk
@@ -115,6 +115,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -216,6 +217,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc.target.darwin-mips.mk b/webrtc.target.darwin-mips.mk
index 54ffbe5..69a80ea 100644
--- a/webrtc.target.darwin-mips.mk
+++ b/webrtc.target.darwin-mips.mk
@@ -122,6 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -231,6 +232,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc.target.darwin-x86.mk b/webrtc.target.darwin-x86.mk
index bc8b91f..44e6a45 100644
--- a/webrtc.target.darwin-x86.mk
+++ b/webrtc.target.darwin-x86.mk
@@ -120,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -226,6 +227,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc.target.darwin-x86_64.mk b/webrtc.target.darwin-x86_64.mk
index 14a7512..c8c1b92 100644
--- a/webrtc.target.darwin-x86_64.mk
+++ b/webrtc.target.darwin-x86_64.mk
@@ -119,6 +119,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -224,6 +225,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc.target.linux-arm.mk b/webrtc.target.linux-arm.mk
index 4fa9f8c..fd6eac7 100644
--- a/webrtc.target.linux-arm.mk
+++ b/webrtc.target.linux-arm.mk
@@ -128,6 +128,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -243,6 +244,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc.target.linux-arm64.mk b/webrtc.target.linux-arm64.mk
index 7f52171..21bdd79 100644
--- a/webrtc.target.linux-arm64.mk
+++ b/webrtc.target.linux-arm64.mk
@@ -115,6 +115,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -216,6 +217,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc.target.linux-mips.mk b/webrtc.target.linux-mips.mk
index 54ffbe5..69a80ea 100644
--- a/webrtc.target.linux-mips.mk
+++ b/webrtc.target.linux-mips.mk
@@ -122,6 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -231,6 +232,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc.target.linux-x86.mk b/webrtc.target.linux-x86.mk
index bc8b91f..44e6a45 100644
--- a/webrtc.target.linux-x86.mk
+++ b/webrtc.target.linux-x86.mk
@@ -120,6 +120,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -226,6 +227,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc.target.linux-x86_64.mk b/webrtc.target.linux-x86_64.mk
index 14a7512..c8c1b92 100644
--- a/webrtc.target.linux-x86_64.mk
+++ b/webrtc.target.linux-x86_64.mk
@@ -119,6 +119,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -224,6 +225,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc_common.target.darwin-arm.mk b/webrtc_common.target.darwin-arm.mk
index 3ad3b3c..10bfcfb 100644
--- a/webrtc_common.target.darwin-arm.mk
+++ b/webrtc_common.target.darwin-arm.mk
@@ -122,6 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -237,6 +238,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc_common.target.darwin-arm64.mk b/webrtc_common.target.darwin-arm64.mk
index 3d0c6c1..0c20822 100644
--- a/webrtc_common.target.darwin-arm64.mk
+++ b/webrtc_common.target.darwin-arm64.mk
@@ -109,6 +109,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -210,6 +211,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc_common.target.darwin-mips.mk b/webrtc_common.target.darwin-mips.mk
index 2c6af89..40b55db 100644
--- a/webrtc_common.target.darwin-mips.mk
+++ b/webrtc_common.target.darwin-mips.mk
@@ -116,6 +116,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -225,6 +226,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc_common.target.darwin-x86.mk b/webrtc_common.target.darwin-x86.mk
index d2b3a90..d537618 100644
--- a/webrtc_common.target.darwin-x86.mk
+++ b/webrtc_common.target.darwin-x86.mk
@@ -114,6 +114,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -220,6 +221,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc_common.target.darwin-x86_64.mk b/webrtc_common.target.darwin-x86_64.mk
index 54a90b2..36f9b87 100644
--- a/webrtc_common.target.darwin-x86_64.mk
+++ b/webrtc_common.target.darwin-x86_64.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -218,6 +219,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc_common.target.linux-arm.mk b/webrtc_common.target.linux-arm.mk
index 3ad3b3c..10bfcfb 100644
--- a/webrtc_common.target.linux-arm.mk
+++ b/webrtc_common.target.linux-arm.mk
@@ -122,6 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -237,6 +238,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc_common.target.linux-arm64.mk b/webrtc_common.target.linux-arm64.mk
index 3d0c6c1..0c20822 100644
--- a/webrtc_common.target.linux-arm64.mk
+++ b/webrtc_common.target.linux-arm64.mk
@@ -109,6 +109,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -210,6 +211,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc_common.target.linux-mips.mk b/webrtc_common.target.linux-mips.mk
index 2c6af89..40b55db 100644
--- a/webrtc_common.target.linux-mips.mk
+++ b/webrtc_common.target.linux-mips.mk
@@ -116,6 +116,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -225,6 +226,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc_common.target.linux-x86.mk b/webrtc_common.target.linux-x86.mk
index d2b3a90..d537618 100644
--- a/webrtc_common.target.linux-x86.mk
+++ b/webrtc_common.target.linux-x86.mk
@@ -114,6 +114,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -220,6 +221,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
diff --git a/webrtc_common.target.linux-x86_64.mk b/webrtc_common.target.linux-x86_64.mk
index 54a90b2..36f9b87 100644
--- a/webrtc_common.target.linux-x86_64.mk
+++ b/webrtc_common.target.linux-x86_64.mk
@@ -113,6 +113,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -218,6 +219,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \