diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-16 14:50:41 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-16 14:50:41 +0000 |
| commit | cb4fdd1fdaaf2c11d40d3aeb3d5f62127230a6cc (patch) | |
| tree | 3abed7548a0a9be7856a740dbee91dfa411dc17c | |
| parent | c7fcada57f3f930a6efb5d57ff2931e8d9c12041 (diff) | |
| download | webrtc-cb4fdd1fdaaf2c11d40d3aeb3d5f62127230a6cc.tar.gz | |
Update makefiles after merge of Chromium at 277428
This commit was generated by merge_from_chromium.py.
Change-Id: I35c59b36614d836accbb543178393a6c061586f1
394 files changed, 1184 insertions, 384 deletions
diff --git a/base/webrtc_base.target.darwin-arm.mk b/base/webrtc_base.target.darwin-arm.mk index b511c94b..72b07fdf 100644 --- a/base/webrtc_base.target.darwin-arm.mk +++ b/base/webrtc_base.target.darwin-arm.mk @@ -198,6 +198,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 c70b25e8..49da5068 100644 --- a/base/webrtc_base.target.darwin-arm64.mk +++ b/base/webrtc_base.target.darwin-arm64.mk @@ -185,6 +185,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 bcf70224..524d9240 100644 --- a/base/webrtc_base.target.darwin-mips.mk +++ b/base/webrtc_base.target.darwin-mips.mk @@ -192,6 +192,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 64b29bfb..7c3e0c87 100644 --- a/base/webrtc_base.target.darwin-x86.mk +++ b/base/webrtc_base.target.darwin-x86.mk @@ -190,6 +190,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 7b3b0f98..4bef0ea6 100644 --- a/base/webrtc_base.target.darwin-x86_64.mk +++ b/base/webrtc_base.target.darwin-x86_64.mk @@ -189,6 +189,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 b511c94b..72b07fdf 100644 --- a/base/webrtc_base.target.linux-arm.mk +++ b/base/webrtc_base.target.linux-arm.mk @@ -198,6 +198,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 c70b25e8..49da5068 100644 --- a/base/webrtc_base.target.linux-arm64.mk +++ b/base/webrtc_base.target.linux-arm64.mk @@ -185,6 +185,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 bcf70224..524d9240 100644 --- a/base/webrtc_base.target.linux-mips.mk +++ b/base/webrtc_base.target.linux-mips.mk @@ -192,6 +192,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 64b29bfb..7c3e0c87 100644 --- a/base/webrtc_base.target.linux-x86.mk +++ b/base/webrtc_base.target.linux-x86.mk @@ -190,6 +190,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 7b3b0f98..4bef0ea6 100644 --- a/base/webrtc_base.target.linux-x86_64.mk +++ b/base/webrtc_base.target.linux-x86_64.mk @@ -189,6 +189,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 e8d1c535..b1fbcb0e 100644 --- a/common_audio/common_audio.target.darwin-arm.mk +++ b/common_audio/common_audio.target.darwin-arm.mk @@ -166,6 +166,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 4f200efc..9f28720d 100644 --- a/common_audio/common_audio.target.darwin-arm64.mk +++ b/common_audio/common_audio.target.darwin-arm64.mk @@ -153,6 +153,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 833e73ed..79968a37 100644 --- a/common_audio/common_audio.target.darwin-mips.mk +++ b/common_audio/common_audio.target.darwin-mips.mk @@ -164,6 +164,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 771c5d9c..64469323 100644 --- a/common_audio/common_audio.target.darwin-x86.mk +++ b/common_audio/common_audio.target.darwin-x86.mk @@ -158,6 +158,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 04d84186..9f7a06e8 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 e8d1c535..b1fbcb0e 100644 --- a/common_audio/common_audio.target.linux-arm.mk +++ b/common_audio/common_audio.target.linux-arm.mk @@ -166,6 +166,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 4f200efc..9f28720d 100644 --- a/common_audio/common_audio.target.linux-arm64.mk +++ b/common_audio/common_audio.target.linux-arm64.mk @@ -153,6 +153,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 833e73ed..79968a37 100644 --- a/common_audio/common_audio.target.linux-mips.mk +++ b/common_audio/common_audio.target.linux-mips.mk @@ -164,6 +164,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 771c5d9c..64469323 100644 --- a/common_audio/common_audio.target.linux-x86.mk +++ b/common_audio/common_audio.target.linux-x86.mk @@ -158,6 +158,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 04d84186..9f7a06e8 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 c9bcafcc..11d7488b 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 c9bcafcc..11d7488b 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 8a9b5dda..95860e57 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 87dff9e3..b3269115 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 8a9b5dda..95860e57 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 87dff9e3..b3269115 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 bc5feb29..e4fcd4f6 100644 --- a/common_video/common_video.target.darwin-arm.mk +++ b/common_video/common_video.target.darwin-arm.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 89de590d..67010e76 100644 --- a/common_video/common_video.target.darwin-arm64.mk +++ b/common_video/common_video.target.darwin-arm64.mk @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 7b8447fd..9687ab43 100644 --- a/common_video/common_video.target.darwin-mips.mk +++ b/common_video/common_video.target.darwin-mips.mk @@ -120,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 adbb3256..ecd62f0e 100644 --- a/common_video/common_video.target.darwin-x86.mk +++ b/common_video/common_video.target.darwin-x86.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 5a972520..9f48d513 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 bc5feb29..e4fcd4f6 100644 --- a/common_video/common_video.target.linux-arm.mk +++ b/common_video/common_video.target.linux-arm.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 89de590d..67010e76 100644 --- a/common_video/common_video.target.linux-arm64.mk +++ b/common_video/common_video.target.linux-arm64.mk @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 7b8447fd..9687ab43 100644 --- a/common_video/common_video.target.linux-mips.mk +++ b/common_video/common_video.target.linux-mips.mk @@ -120,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 adbb3256..ecd62f0e 100644 --- a/common_video/common_video.target.linux-x86.mk +++ b/common_video/common_video.target.linux-x86.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 5a972520..9f48d513 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 c8840efe..48b83dd8 100644 --- a/modules/CNG.target.darwin-arm.mk +++ b/modules/CNG.target.darwin-arm.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 b1a5542e..57253108 100644 --- a/modules/CNG.target.darwin-arm64.mk +++ b/modules/CNG.target.darwin-arm64.mk @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 b78c635b..ec0dcc73 100644 --- a/modules/CNG.target.darwin-mips.mk +++ b/modules/CNG.target.darwin-mips.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 f330c160..b74118c8 100644 --- a/modules/CNG.target.darwin-x86.mk +++ b/modules/CNG.target.darwin-x86.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 161cebd2..04c79498 100644 --- a/modules/CNG.target.darwin-x86_64.mk +++ b/modules/CNG.target.darwin-x86_64.mk @@ -117,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 c8840efe..48b83dd8 100644 --- a/modules/CNG.target.linux-arm.mk +++ b/modules/CNG.target.linux-arm.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 b1a5542e..57253108 100644 --- a/modules/CNG.target.linux-arm64.mk +++ b/modules/CNG.target.linux-arm64.mk @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 b78c635b..ec0dcc73 100644 --- a/modules/CNG.target.linux-mips.mk +++ b/modules/CNG.target.linux-mips.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 f330c160..b74118c8 100644 --- a/modules/CNG.target.linux-x86.mk +++ b/modules/CNG.target.linux-x86.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 161cebd2..04c79498 100644 --- a/modules/CNG.target.linux-x86_64.mk +++ b/modules/CNG.target.linux-x86_64.mk @@ -117,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 f3231ec5..e2be0f2d 100644 --- a/modules/G711.target.darwin-arm.mk +++ b/modules/G711.target.darwin-arm.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 3feb0ce1..d3eff919 100644 --- a/modules/G711.target.darwin-arm64.mk +++ b/modules/G711.target.darwin-arm64.mk @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 91a20b33..6f636cee 100644 --- a/modules/G711.target.darwin-mips.mk +++ b/modules/G711.target.darwin-mips.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 c261d157..2a5336b0 100644 --- a/modules/G711.target.darwin-x86.mk +++ b/modules/G711.target.darwin-x86.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 0d04202e..098100c3 100644 --- a/modules/G711.target.darwin-x86_64.mk +++ b/modules/G711.target.darwin-x86_64.mk @@ -117,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 f3231ec5..e2be0f2d 100644 --- a/modules/G711.target.linux-arm.mk +++ b/modules/G711.target.linux-arm.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 3feb0ce1..d3eff919 100644 --- a/modules/G711.target.linux-arm64.mk +++ b/modules/G711.target.linux-arm64.mk @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 91a20b33..6f636cee 100644 --- a/modules/G711.target.linux-mips.mk +++ b/modules/G711.target.linux-mips.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 c261d157..2a5336b0 100644 --- a/modules/G711.target.linux-x86.mk +++ b/modules/G711.target.linux-x86.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 0d04202e..098100c3 100644 --- a/modules/G711.target.linux-x86_64.mk +++ b/modules/G711.target.linux-x86_64.mk @@ -117,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 96578247..cc9fe2fd 100644 --- a/modules/G722.target.darwin-arm.mk +++ b/modules/G722.target.darwin-arm.mk @@ -127,6 +127,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 c3f21804..fbaf1103 100644 --- a/modules/G722.target.darwin-arm64.mk +++ b/modules/G722.target.darwin-arm64.mk @@ -114,6 +114,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 bfb08bd2..9fb6a508 100644 --- a/modules/G722.target.darwin-mips.mk +++ b/modules/G722.target.darwin-mips.mk @@ -122,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 97e5c3ee..242f640e 100644 --- a/modules/G722.target.darwin-x86.mk +++ b/modules/G722.target.darwin-x86.mk @@ -119,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 c89ffc62..8f71ab52 100644 --- a/modules/G722.target.darwin-x86_64.mk +++ b/modules/G722.target.darwin-x86_64.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 96578247..cc9fe2fd 100644 --- a/modules/G722.target.linux-arm.mk +++ b/modules/G722.target.linux-arm.mk @@ -127,6 +127,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 c3f21804..fbaf1103 100644 --- a/modules/G722.target.linux-arm64.mk +++ b/modules/G722.target.linux-arm64.mk @@ -114,6 +114,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 bfb08bd2..9fb6a508 100644 --- a/modules/G722.target.linux-mips.mk +++ b/modules/G722.target.linux-mips.mk @@ -122,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 97e5c3ee..242f640e 100644 --- a/modules/G722.target.linux-x86.mk +++ b/modules/G722.target.linux-x86.mk @@ -119,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 c89ffc62..8f71ab52 100644 --- a/modules/G722.target.linux-x86_64.mk +++ b/modules/G722.target.linux-x86_64.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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-arm.mk b/modules/PCM16B.target.darwin-arm.mk index e1d46115..49eb9501 100644 --- a/modules/PCM16B.target.darwin-arm.mk +++ b/modules/PCM16B.target.darwin-arm.mk @@ -125,6 +125,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 961ffcbd..afa31ccd 100644 --- a/modules/PCM16B.target.darwin-arm64.mk +++ b/modules/PCM16B.target.darwin-arm64.mk @@ -112,6 +112,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 4bfc5720..8a0054c5 100644 --- a/modules/PCM16B.target.darwin-mips.mk +++ b/modules/PCM16B.target.darwin-mips.mk @@ -120,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 6301c139..1288e024 100644 --- a/modules/PCM16B.target.darwin-x86.mk +++ b/modules/PCM16B.target.darwin-x86.mk @@ -117,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 3debfcd9..db00bf34 100644 --- a/modules/PCM16B.target.darwin-x86_64.mk +++ b/modules/PCM16B.target.darwin-x86_64.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 e1d46115..49eb9501 100644 --- a/modules/PCM16B.target.linux-arm.mk +++ b/modules/PCM16B.target.linux-arm.mk @@ -125,6 +125,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 961ffcbd..afa31ccd 100644 --- a/modules/PCM16B.target.linux-arm64.mk +++ b/modules/PCM16B.target.linux-arm64.mk @@ -112,6 +112,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 4bfc5720..8a0054c5 100644 --- a/modules/PCM16B.target.linux-mips.mk +++ b/modules/PCM16B.target.linux-mips.mk @@ -120,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 6301c139..1288e024 100644 --- a/modules/PCM16B.target.linux-x86.mk +++ b/modules/PCM16B.target.linux-x86.mk @@ -117,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 3debfcd9..db00bf34 100644 --- a/modules/PCM16B.target.linux-x86_64.mk +++ b/modules/PCM16B.target.linux-x86_64.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 64401e3b..1d5316fb 100644 --- a/modules/audio_coding_module.target.darwin-arm.mk +++ b/modules/audio_coding_module.target.darwin-arm.mk @@ -154,6 +154,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 8ade216a..fcf927b6 100644 --- a/modules/audio_coding_module.target.darwin-arm64.mk +++ b/modules/audio_coding_module.target.darwin-arm64.mk @@ -141,6 +141,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 a0022f22..c8611528 100644 --- a/modules/audio_coding_module.target.darwin-mips.mk +++ b/modules/audio_coding_module.target.darwin-mips.mk @@ -149,6 +149,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 b84a7fb9..4f2b1ebe 100644 --- a/modules/audio_coding_module.target.darwin-x86.mk +++ b/modules/audio_coding_module.target.darwin-x86.mk @@ -146,6 +146,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 45ca0e90..9abccc26 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 64401e3b..1d5316fb 100644 --- a/modules/audio_coding_module.target.linux-arm.mk +++ b/modules/audio_coding_module.target.linux-arm.mk @@ -154,6 +154,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 8ade216a..fcf927b6 100644 --- a/modules/audio_coding_module.target.linux-arm64.mk +++ b/modules/audio_coding_module.target.linux-arm64.mk @@ -141,6 +141,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 a0022f22..c8611528 100644 --- a/modules/audio_coding_module.target.linux-mips.mk +++ b/modules/audio_coding_module.target.linux-mips.mk @@ -149,6 +149,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 b84a7fb9..4f2b1ebe 100644 --- a/modules/audio_coding_module.target.linux-x86.mk +++ b/modules/audio_coding_module.target.linux-x86.mk @@ -146,6 +146,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 45ca0e90..9abccc26 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 adeaace1..1c81635c 100644 --- a/modules/audio_conference_mixer.target.darwin-arm.mk +++ b/modules/audio_conference_mixer.target.darwin-arm.mk @@ -129,6 +129,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 0faabfad..52a59fad 100644 --- a/modules/audio_conference_mixer.target.darwin-arm64.mk +++ b/modules/audio_conference_mixer.target.darwin-arm64.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 5893b3a9..68f2c3c7 100644 --- a/modules/audio_conference_mixer.target.darwin-mips.mk +++ b/modules/audio_conference_mixer.target.darwin-mips.mk @@ -124,6 +124,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 ca559ba4..819b6d74 100644 --- a/modules/audio_conference_mixer.target.darwin-x86.mk +++ b/modules/audio_conference_mixer.target.darwin-x86.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 5a134b64..d3ce5408 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 adeaace1..1c81635c 100644 --- a/modules/audio_conference_mixer.target.linux-arm.mk +++ b/modules/audio_conference_mixer.target.linux-arm.mk @@ -129,6 +129,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 0faabfad..52a59fad 100644 --- a/modules/audio_conference_mixer.target.linux-arm64.mk +++ b/modules/audio_conference_mixer.target.linux-arm64.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 5893b3a9..68f2c3c7 100644 --- a/modules/audio_conference_mixer.target.linux-mips.mk +++ b/modules/audio_conference_mixer.target.linux-mips.mk @@ -124,6 +124,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 ca559ba4..819b6d74 100644 --- a/modules/audio_conference_mixer.target.linux-x86.mk +++ b/modules/audio_conference_mixer.target.linux-x86.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 5a134b64..d3ce5408 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 342da522..afce6faa 100644 --- a/modules/audio_device.target.darwin-arm.mk +++ b/modules/audio_device.target.darwin-arm.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 414722ea..11c79ae5 100644 --- a/modules/audio_device.target.darwin-arm64.mk +++ b/modules/audio_device.target.darwin-arm64.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 9deacadf..fcd225ad 100644 --- a/modules/audio_device.target.darwin-mips.mk +++ b/modules/audio_device.target.darwin-mips.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 19843d2a..ca2ec6f0 100644 --- a/modules/audio_device.target.darwin-x86.mk +++ b/modules/audio_device.target.darwin-x86.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 2320a98e..04c576b5 100644 --- a/modules/audio_device.target.darwin-x86_64.mk +++ b/modules/audio_device.target.darwin-x86_64.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 342da522..afce6faa 100644 --- a/modules/audio_device.target.linux-arm.mk +++ b/modules/audio_device.target.linux-arm.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 414722ea..11c79ae5 100644 --- a/modules/audio_device.target.linux-arm64.mk +++ b/modules/audio_device.target.linux-arm64.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 9deacadf..fcd225ad 100644 --- a/modules/audio_device.target.linux-mips.mk +++ b/modules/audio_device.target.linux-mips.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 19843d2a..ca2ec6f0 100644 --- a/modules/audio_device.target.linux-x86.mk +++ b/modules/audio_device.target.linux-x86.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 2320a98e..04c576b5 100644 --- a/modules/audio_device.target.linux-x86_64.mk +++ b/modules/audio_device.target.linux-x86_64.mk @@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \ 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 d471aa5a..1f7c1c97 100644 --- a/modules/audio_processing.target.darwin-arm.mk +++ b/modules/audio_processing.target.darwin-arm.mk @@ -159,6 +159,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 29b1487d..12d3e688 100644 --- a/modules/audio_processing.target.darwin-arm64.mk +++ b/modules/audio_processing.target.darwin-arm64.mk @@ -145,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 b32b2949..9aa97e1d 100644 --- a/modules/audio_processing.target.darwin-mips.mk +++ b/modules/audio_processing.target.darwin-mips.mk @@ -155,6 +155,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 9343d2de..8a9765bf 100644 --- a/modules/audio_processing.target.darwin-x86.mk +++ b/modules/audio_processing.target.darwin-x86.mk @@ -150,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 79c8942b..c8b84ef6 100644 --- a/modules/audio_processing.target.darwin-x86_64.mk +++ b/modules/audio_processing.target.darwin-x86_64.mk @@ -149,6 +149,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 d471aa5a..1f7c1c97 100644 --- a/modules/audio_processing.target.linux-arm.mk +++ b/modules/audio_processing.target.linux-arm.mk @@ -159,6 +159,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 29b1487d..12d3e688 100644 --- a/modules/audio_processing.target.linux-arm64.mk +++ b/modules/audio_processing.target.linux-arm64.mk @@ -145,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 b32b2949..9aa97e1d 100644 --- a/modules/audio_processing.target.linux-mips.mk +++ b/modules/audio_processing.target.linux-mips.mk @@ -155,6 +155,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 9343d2de..8a9765bf 100644 --- a/modules/audio_processing.target.linux-x86.mk +++ b/modules/audio_processing.target.linux-x86.mk @@ -150,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 79c8942b..c8b84ef6 100644 --- a/modules/audio_processing.target.linux-x86_64.mk +++ b/modules/audio_processing.target.linux-x86_64.mk @@ -149,6 +149,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 01bc031f..b607f773 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 01bc031f..b607f773 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 bdc0f853..c96e485d 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 bdc0f853..c96e485d 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 a6aa4264..d49c7aa5 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 a6aa4264..d49c7aa5 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 b2a4fd08..5128a74c 100644 --- a/modules/audio_processing_neon.target.darwin-arm.mk +++ b/modules/audio_processing_neon.target.darwin-arm.mk @@ -131,6 +131,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 b2a4fd08..5128a74c 100644 --- a/modules/audio_processing_neon.target.linux-arm.mk +++ b/modules/audio_processing_neon.target.linux-arm.mk @@ -131,6 +131,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 213670ec..eeb829c5 100644 --- a/modules/audio_processing_sse2.target.darwin-x86.mk +++ b/modules/audio_processing_sse2.target.darwin-x86.mk @@ -119,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 783b0869..ee3b6d89 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 213670ec..eeb829c5 100644 --- a/modules/audio_processing_sse2.target.linux-x86.mk +++ b/modules/audio_processing_sse2.target.linux-x86.mk @@ -119,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 783b0869..ee3b6d89 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 2d95b428..56ff14ba 100644 --- a/modules/audioproc_debug_proto.target.darwin-arm.mk +++ b/modules/audioproc_debug_proto.target.darwin-arm.mk @@ -153,6 +153,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 a7b1ac59..eafc7b7f 100644 --- a/modules/audioproc_debug_proto.target.darwin-arm64.mk +++ b/modules/audioproc_debug_proto.target.darwin-arm64.mk @@ -140,6 +140,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 cb49e174..ce1fc7f1 100644 --- a/modules/audioproc_debug_proto.target.darwin-mips.mk +++ b/modules/audioproc_debug_proto.target.darwin-mips.mk @@ -148,6 +148,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 012246aa..ac7a7ace 100644 --- a/modules/audioproc_debug_proto.target.darwin-x86.mk +++ b/modules/audioproc_debug_proto.target.darwin-x86.mk @@ -145,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 e0b0b0bf..046af59a 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 2d95b428..56ff14ba 100644 --- a/modules/audioproc_debug_proto.target.linux-arm.mk +++ b/modules/audioproc_debug_proto.target.linux-arm.mk @@ -153,6 +153,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 a7b1ac59..eafc7b7f 100644 --- a/modules/audioproc_debug_proto.target.linux-arm64.mk +++ b/modules/audioproc_debug_proto.target.linux-arm64.mk @@ -140,6 +140,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 cb49e174..ce1fc7f1 100644 --- a/modules/audioproc_debug_proto.target.linux-mips.mk +++ b/modules/audioproc_debug_proto.target.linux-mips.mk @@ -148,6 +148,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 012246aa..ac7a7ace 100644 --- a/modules/audioproc_debug_proto.target.linux-x86.mk +++ b/modules/audioproc_debug_proto.target.linux-x86.mk @@ -145,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 e0b0b0bf..046af59a 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 9ba4960b..182b831d 100644 --- a/modules/bitrate_controller.target.darwin-arm.mk +++ b/modules/bitrate_controller.target.darwin-arm.mk @@ -127,6 +127,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 c9124e25..d5d7bd29 100644 --- a/modules/bitrate_controller.target.darwin-arm64.mk +++ b/modules/bitrate_controller.target.darwin-arm64.mk @@ -114,6 +114,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 2a3ef2f9..953a114a 100644 --- a/modules/bitrate_controller.target.darwin-mips.mk +++ b/modules/bitrate_controller.target.darwin-mips.mk @@ -122,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 c6c91ecf..94acf571 100644 --- a/modules/bitrate_controller.target.darwin-x86.mk +++ b/modules/bitrate_controller.target.darwin-x86.mk @@ -119,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 f87e2065..19b49409 100644 --- a/modules/bitrate_controller.target.darwin-x86_64.mk +++ b/modules/bitrate_controller.target.darwin-x86_64.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 9ba4960b..182b831d 100644 --- a/modules/bitrate_controller.target.linux-arm.mk +++ b/modules/bitrate_controller.target.linux-arm.mk @@ -127,6 +127,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 c9124e25..d5d7bd29 100644 --- a/modules/bitrate_controller.target.linux-arm64.mk +++ b/modules/bitrate_controller.target.linux-arm64.mk @@ -114,6 +114,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 2a3ef2f9..953a114a 100644 --- a/modules/bitrate_controller.target.linux-mips.mk +++ b/modules/bitrate_controller.target.linux-mips.mk @@ -122,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 c6c91ecf..94acf571 100644 --- a/modules/bitrate_controller.target.linux-x86.mk +++ b/modules/bitrate_controller.target.linux-x86.mk @@ -119,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 f87e2065..19b49409 100644 --- a/modules/bitrate_controller.target.linux-x86_64.mk +++ b/modules/bitrate_controller.target.linux-x86_64.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 19586f85..2ccc303c 100644 --- a/modules/iLBC.target.darwin-arm.mk +++ b/modules/iLBC.target.darwin-arm.mk @@ -193,6 +193,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 a4d47563..467bd07b 100644 --- a/modules/iLBC.target.darwin-arm64.mk +++ b/modules/iLBC.target.darwin-arm64.mk @@ -180,6 +180,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 62448da0..dcbcd90c 100644 --- a/modules/iLBC.target.darwin-mips.mk +++ b/modules/iLBC.target.darwin-mips.mk @@ -188,6 +188,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 dd503a76..f922f2e0 100644 --- a/modules/iLBC.target.darwin-x86.mk +++ b/modules/iLBC.target.darwin-x86.mk @@ -185,6 +185,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 88df1271..736dbbb0 100644 --- a/modules/iLBC.target.darwin-x86_64.mk +++ b/modules/iLBC.target.darwin-x86_64.mk @@ -184,6 +184,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 19586f85..2ccc303c 100644 --- a/modules/iLBC.target.linux-arm.mk +++ b/modules/iLBC.target.linux-arm.mk @@ -193,6 +193,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 a4d47563..467bd07b 100644 --- a/modules/iLBC.target.linux-arm64.mk +++ b/modules/iLBC.target.linux-arm64.mk @@ -180,6 +180,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 62448da0..dcbcd90c 100644 --- a/modules/iLBC.target.linux-mips.mk +++ b/modules/iLBC.target.linux-mips.mk @@ -188,6 +188,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 dd503a76..f922f2e0 100644 --- a/modules/iLBC.target.linux-x86.mk +++ b/modules/iLBC.target.linux-x86.mk @@ -185,6 +185,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 88df1271..736dbbb0 100644 --- a/modules/iLBC.target.linux-x86_64.mk +++ b/modules/iLBC.target.linux-x86_64.mk @@ -184,6 +184,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 08339594..fe77b995 100644 --- a/modules/iSAC.target.darwin-arm.mk +++ b/modules/iSAC.target.darwin-arm.mk @@ -152,6 +152,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 e7ea6649..d8437101 100644 --- a/modules/iSAC.target.darwin-arm64.mk +++ b/modules/iSAC.target.darwin-arm64.mk @@ -139,6 +139,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 571ba5cc..df0ee04f 100644 --- a/modules/iSAC.target.darwin-mips.mk +++ b/modules/iSAC.target.darwin-mips.mk @@ -147,6 +147,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 20c156b4..d8b650c1 100644 --- a/modules/iSAC.target.darwin-x86.mk +++ b/modules/iSAC.target.darwin-x86.mk @@ -144,6 +144,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 00ad5572..7e2d669e 100644 --- a/modules/iSAC.target.darwin-x86_64.mk +++ b/modules/iSAC.target.darwin-x86_64.mk @@ -143,6 +143,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 08339594..fe77b995 100644 --- a/modules/iSAC.target.linux-arm.mk +++ b/modules/iSAC.target.linux-arm.mk @@ -152,6 +152,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 e7ea6649..d8437101 100644 --- a/modules/iSAC.target.linux-arm64.mk +++ b/modules/iSAC.target.linux-arm64.mk @@ -139,6 +139,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 571ba5cc..df0ee04f 100644 --- a/modules/iSAC.target.linux-mips.mk +++ b/modules/iSAC.target.linux-mips.mk @@ -147,6 +147,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 20c156b4..d8b650c1 100644 --- a/modules/iSAC.target.linux-x86.mk +++ b/modules/iSAC.target.linux-x86.mk @@ -144,6 +144,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 00ad5572..7e2d669e 100644 --- a/modules/iSAC.target.linux-x86_64.mk +++ b/modules/iSAC.target.linux-x86_64.mk @@ -143,6 +143,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 fdf4f11b..55aebcf0 100644 --- a/modules/iSACFix.target.darwin-arm.mk +++ b/modules/iSACFix.target.darwin-arm.mk @@ -150,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 5c9f3c0a..d94f4bb5 100644 --- a/modules/iSACFix.target.darwin-arm64.mk +++ b/modules/iSACFix.target.darwin-arm64.mk @@ -137,6 +137,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 478c9c99..923ac1a4 100644 --- a/modules/iSACFix.target.darwin-mips.mk +++ b/modules/iSACFix.target.darwin-mips.mk @@ -39,7 +39,6 @@ LOCAL_SRC_FILES := \ 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 @@ LOCAL_SRC_FILES := \ 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 8449953d..ba4eb356 100644 --- a/modules/iSACFix.target.darwin-x86.mk +++ b/modules/iSACFix.target.darwin-x86.mk @@ -142,6 +142,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 9d14af03..bca3061a 100644 --- a/modules/iSACFix.target.darwin-x86_64.mk +++ b/modules/iSACFix.target.darwin-x86_64.mk @@ -141,6 +141,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 fdf4f11b..55aebcf0 100644 --- a/modules/iSACFix.target.linux-arm.mk +++ b/modules/iSACFix.target.linux-arm.mk @@ -150,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 5c9f3c0a..d94f4bb5 100644 --- a/modules/iSACFix.target.linux-arm64.mk +++ b/modules/iSACFix.target.linux-arm64.mk @@ -137,6 +137,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 478c9c99..923ac1a4 100644 --- a/modules/iSACFix.target.linux-mips.mk +++ b/modules/iSACFix.target.linux-mips.mk @@ -39,7 +39,6 @@ LOCAL_SRC_FILES := \ 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 @@ LOCAL_SRC_FILES := \ 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 8449953d..ba4eb356 100644 --- a/modules/iSACFix.target.linux-x86.mk +++ b/modules/iSACFix.target.linux-x86.mk @@ -142,6 +142,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 9d14af03..bca3061a 100644 --- a/modules/iSACFix.target.linux-x86_64.mk +++ b/modules/iSACFix.target.linux-x86_64.mk @@ -141,6 +141,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 acb9241f..56b3568b 100644 --- a/modules/isac_neon.target.darwin-arm.mk +++ b/modules/isac_neon.target.darwin-arm.mk @@ -132,6 +132,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 acb9241f..56b3568b 100644 --- a/modules/isac_neon.target.linux-arm.mk +++ b/modules/isac_neon.target.linux-arm.mk @@ -132,6 +132,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 aacd8ef0..4ee56c23 100644 --- a/modules/media_file.target.darwin-arm.mk +++ b/modules/media_file.target.darwin-arm.mk @@ -128,6 +128,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 0399e1c9..0008a3ce 100644 --- a/modules/media_file.target.darwin-arm64.mk +++ b/modules/media_file.target.darwin-arm64.mk @@ -115,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 acbff9c1..1ada8f80 100644 --- a/modules/media_file.target.darwin-mips.mk +++ b/modules/media_file.target.darwin-mips.mk @@ -123,6 +123,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 4cf0eb44..a9938288 100644 --- a/modules/media_file.target.darwin-x86.mk +++ b/modules/media_file.target.darwin-x86.mk @@ -120,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 cfbaae16..73cc56a5 100644 --- a/modules/media_file.target.darwin-x86_64.mk +++ b/modules/media_file.target.darwin-x86_64.mk @@ -119,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 aacd8ef0..4ee56c23 100644 --- a/modules/media_file.target.linux-arm.mk +++ b/modules/media_file.target.linux-arm.mk @@ -128,6 +128,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 0399e1c9..0008a3ce 100644 --- a/modules/media_file.target.linux-arm64.mk +++ b/modules/media_file.target.linux-arm64.mk @@ -115,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 acbff9c1..1ada8f80 100644 --- a/modules/media_file.target.linux-mips.mk +++ b/modules/media_file.target.linux-mips.mk @@ -123,6 +123,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 4cf0eb44..a9938288 100644 --- a/modules/media_file.target.linux-x86.mk +++ b/modules/media_file.target.linux-x86.mk @@ -120,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 cfbaae16..73cc56a5 100644 --- a/modules/media_file.target.linux-x86_64.mk +++ b/modules/media_file.target.linux-x86_64.mk @@ -119,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 index 96e5b553..5735810a 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 @@ 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 + 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths 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 @@ LOCAL_SHARED_LIBRARIES := \ # 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 index 5f9620b8..4e247a80 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 @@ 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 + 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths 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 @@ LOCAL_SHARED_LIBRARIES := \ # 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.linux-mips.mk b/modules/neteq.target.darwin-mips.mk index 13f5d257..124c5326 100644 --- a/modules/NetEq4.target.linux-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 @@ 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 + 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths 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 @@ LOCAL_SHARED_LIBRARIES := \ # 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.linux-x86.mk b/modules/neteq.target.darwin-x86.mk index 0f956307..4f8c2ddc 100644 --- a/modules/NetEq4.target.linux-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 @@ 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 + 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths 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 @@ LOCAL_SHARED_LIBRARIES := \ # 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 index 01f3668e..6d3cf52d 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 @@ 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 + 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths 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 @@ LOCAL_SHARED_LIBRARIES := \ # 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.linux-arm.mk b/modules/neteq.target.linux-arm.mk index 96e5b553..5735810a 100644 --- a/modules/NetEq4.target.linux-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 @@ 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 + 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths 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 @@ LOCAL_SHARED_LIBRARIES := \ # 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.linux-arm64.mk b/modules/neteq.target.linux-arm64.mk index 5f9620b8..4e247a80 100644 --- a/modules/NetEq4.target.linux-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 @@ 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 + 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths 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 @@ LOCAL_SHARED_LIBRARIES := \ # 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 index 13f5d257..124c5326 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 @@ 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 + 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths 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 @@ LOCAL_SHARED_LIBRARIES := \ # 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 index 0f956307..4f8c2ddc 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 @@ 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 + 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths 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 @@ LOCAL_SHARED_LIBRARIES := \ # 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.linux-x86_64.mk b/modules/neteq.target.linux-x86_64.mk index 01f3668e..6d3cf52d 100644 --- a/modules/NetEq4.target.linux-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 @@ 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 + 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths 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 @@ LOCAL_SHARED_LIBRARIES := \ # 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 c4267706..113cff0e 100644 --- a/modules/paced_sender.target.darwin-arm.mk +++ b/modules/paced_sender.target.darwin-arm.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 229400b6..aff94313 100644 --- a/modules/paced_sender.target.darwin-arm64.mk +++ b/modules/paced_sender.target.darwin-arm64.mk @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 11b6d8c5..c0bdb720 100644 --- a/modules/paced_sender.target.darwin-mips.mk +++ b/modules/paced_sender.target.darwin-mips.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 1117243b..dbd81ae3 100644 --- a/modules/paced_sender.target.darwin-x86.mk +++ b/modules/paced_sender.target.darwin-x86.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 aac7d250..29b232c4 100644 --- a/modules/paced_sender.target.darwin-x86_64.mk +++ b/modules/paced_sender.target.darwin-x86_64.mk @@ -117,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 c4267706..113cff0e 100644 --- a/modules/paced_sender.target.linux-arm.mk +++ b/modules/paced_sender.target.linux-arm.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 229400b6..aff94313 100644 --- a/modules/paced_sender.target.linux-arm64.mk +++ b/modules/paced_sender.target.linux-arm64.mk @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 11b6d8c5..c0bdb720 100644 --- a/modules/paced_sender.target.linux-mips.mk +++ b/modules/paced_sender.target.linux-mips.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 1117243b..dbd81ae3 100644 --- a/modules/paced_sender.target.linux-x86.mk +++ b/modules/paced_sender.target.linux-x86.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 aac7d250..29b232c4 100644 --- a/modules/paced_sender.target.linux-x86_64.mk +++ b/modules/paced_sender.target.linux-x86_64.mk @@ -117,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 5de27c0e..e531eb07 100644 --- a/modules/remote_bitrate_estimator.target.darwin-arm.mk +++ b/modules/remote_bitrate_estimator.target.darwin-arm.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 e7e41524..ff731d5c 100644 --- a/modules/remote_bitrate_estimator.target.darwin-arm64.mk +++ b/modules/remote_bitrate_estimator.target.darwin-arm64.mk @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 afa2aac6..4f247a9d 100644 --- a/modules/remote_bitrate_estimator.target.darwin-mips.mk +++ b/modules/remote_bitrate_estimator.target.darwin-mips.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 91c7dc48..0c146943 100644 --- a/modules/remote_bitrate_estimator.target.darwin-x86.mk +++ b/modules/remote_bitrate_estimator.target.darwin-x86.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 9524ee17..b5fb9ea6 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 5de27c0e..e531eb07 100644 --- a/modules/remote_bitrate_estimator.target.linux-arm.mk +++ b/modules/remote_bitrate_estimator.target.linux-arm.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 e7e41524..ff731d5c 100644 --- a/modules/remote_bitrate_estimator.target.linux-arm64.mk +++ b/modules/remote_bitrate_estimator.target.linux-arm64.mk @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 afa2aac6..4f247a9d 100644 --- a/modules/remote_bitrate_estimator.target.linux-mips.mk +++ b/modules/remote_bitrate_estimator.target.linux-mips.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 91c7dc48..0c146943 100644 --- a/modules/remote_bitrate_estimator.target.linux-x86.mk +++ b/modules/remote_bitrate_estimator.target.linux-x86.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 9524ee17..b5fb9ea6 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 e0274a8a..7ef87389 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 51a1d118..62cfecaf 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 c95dc713..5aa92d00 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 9c37d565..991bf15b 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 6e834274..482c136e 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 e0274a8a..7ef87389 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 51a1d118..62cfecaf 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 c95dc713..5aa92d00 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 9c37d565..991bf15b 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 6e834274..482c136e 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 5f08e976..67a9e406 100644 --- a/modules/rtp_rtcp.target.darwin-arm.mk +++ b/modules/rtp_rtcp.target.darwin-arm.mk @@ -155,6 +155,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 62d6f8cc..0f1f3116 100644 --- a/modules/rtp_rtcp.target.darwin-arm64.mk +++ b/modules/rtp_rtcp.target.darwin-arm64.mk @@ -142,6 +142,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 10898a7a..5d87d71a 100644 --- a/modules/rtp_rtcp.target.darwin-mips.mk +++ b/modules/rtp_rtcp.target.darwin-mips.mk @@ -150,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 89a365fa..fadd4664 100644 --- a/modules/rtp_rtcp.target.darwin-x86.mk +++ b/modules/rtp_rtcp.target.darwin-x86.mk @@ -147,6 +147,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 d8502dc8..dc3ad83e 100644 --- a/modules/rtp_rtcp.target.darwin-x86_64.mk +++ b/modules/rtp_rtcp.target.darwin-x86_64.mk @@ -146,6 +146,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 5f08e976..67a9e406 100644 --- a/modules/rtp_rtcp.target.linux-arm.mk +++ b/modules/rtp_rtcp.target.linux-arm.mk @@ -155,6 +155,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 62d6f8cc..0f1f3116 100644 --- a/modules/rtp_rtcp.target.linux-arm64.mk +++ b/modules/rtp_rtcp.target.linux-arm64.mk @@ -142,6 +142,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 10898a7a..5d87d71a 100644 --- a/modules/rtp_rtcp.target.linux-mips.mk +++ b/modules/rtp_rtcp.target.linux-mips.mk @@ -150,6 +150,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 89a365fa..fadd4664 100644 --- a/modules/rtp_rtcp.target.linux-x86.mk +++ b/modules/rtp_rtcp.target.linux-x86.mk @@ -147,6 +147,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 d8502dc8..dc3ad83e 100644 --- a/modules/rtp_rtcp.target.linux-x86_64.mk +++ b/modules/rtp_rtcp.target.linux-x86_64.mk @@ -146,6 +146,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 e1ab742c..2ce68b72 100644 --- a/modules/video_capture_module.target.darwin-arm.mk +++ b/modules/video_capture_module.target.darwin-arm.mk @@ -130,6 +130,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 2ac94276..b95713d7 100644 --- a/modules/video_capture_module.target.darwin-arm64.mk +++ b/modules/video_capture_module.target.darwin-arm64.mk @@ -117,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 37c8a0d6..c65396c8 100644 --- a/modules/video_capture_module.target.darwin-mips.mk +++ b/modules/video_capture_module.target.darwin-mips.mk @@ -125,6 +125,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 260bbfdb..f62c716c 100644 --- a/modules/video_capture_module.target.darwin-x86.mk +++ b/modules/video_capture_module.target.darwin-x86.mk @@ -122,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 347d16c6..ae511a0a 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 e1ab742c..2ce68b72 100644 --- a/modules/video_capture_module.target.linux-arm.mk +++ b/modules/video_capture_module.target.linux-arm.mk @@ -130,6 +130,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 2ac94276..b95713d7 100644 --- a/modules/video_capture_module.target.linux-arm64.mk +++ b/modules/video_capture_module.target.linux-arm64.mk @@ -117,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 37c8a0d6..c65396c8 100644 --- a/modules/video_capture_module.target.linux-mips.mk +++ b/modules/video_capture_module.target.linux-mips.mk @@ -125,6 +125,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 260bbfdb..f62c716c 100644 --- a/modules/video_capture_module.target.linux-x86.mk +++ b/modules/video_capture_module.target.linux-x86.mk @@ -122,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 347d16c6..ae511a0a 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 92787e17..7050b1cf 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 3a021a91..0cfc3ab2 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 a1f689fb..570eb312 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 839548fd..27b1c3a2 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 fb4892cf..c7fc9be8 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 92787e17..7050b1cf 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 3a021a91..0cfc3ab2 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 a1f689fb..570eb312 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 839548fd..27b1c3a2 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 fb4892cf..c7fc9be8 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 5a9577c5..b3ddd7f1 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 d19d118d..c14e11a1 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 1b5cd756..bfd617f2 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 e3a9bc23..1e410032 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 af95f814..44aa4f90 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 5a9577c5..b3ddd7f1 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 d19d118d..c14e11a1 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 1b5cd756..bfd617f2 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 e3a9bc23..1e410032 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 af95f814..44aa4f90 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 f01d3122..8cd6c3b3 100644 --- a/modules/video_processing.target.darwin-arm.mk +++ b/modules/video_processing.target.darwin-arm.mk @@ -135,6 +135,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 3813200f..8da8b99c 100644 --- a/modules/video_processing.target.darwin-arm64.mk +++ b/modules/video_processing.target.darwin-arm64.mk @@ -122,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 41d8f1b7..5b64e822 100644 --- a/modules/video_processing.target.darwin-mips.mk +++ b/modules/video_processing.target.darwin-mips.mk @@ -130,6 +130,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 38705fc8..e1c8322c 100644 --- a/modules/video_processing.target.darwin-x86.mk +++ b/modules/video_processing.target.darwin-x86.mk @@ -127,6 +127,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 ef8f87ec..257fe31e 100644 --- a/modules/video_processing.target.darwin-x86_64.mk +++ b/modules/video_processing.target.darwin-x86_64.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 f01d3122..8cd6c3b3 100644 --- a/modules/video_processing.target.linux-arm.mk +++ b/modules/video_processing.target.linux-arm.mk @@ -135,6 +135,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 3813200f..8da8b99c 100644 --- a/modules/video_processing.target.linux-arm64.mk +++ b/modules/video_processing.target.linux-arm64.mk @@ -122,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 41d8f1b7..5b64e822 100644 --- a/modules/video_processing.target.linux-mips.mk +++ b/modules/video_processing.target.linux-mips.mk @@ -130,6 +130,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 38705fc8..e1c8322c 100644 --- a/modules/video_processing.target.linux-x86.mk +++ b/modules/video_processing.target.linux-x86.mk @@ -127,6 +127,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 ef8f87ec..257fe31e 100644 --- a/modules/video_processing.target.linux-x86_64.mk +++ b/modules/video_processing.target.linux-x86_64.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 6473ff51..b8287a8e 100644 --- a/modules/video_processing_sse2.target.darwin-x86.mk +++ b/modules/video_processing_sse2.target.darwin-x86.mk @@ -119,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 7425f3df..2aae9934 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 6473ff51..b8287a8e 100644 --- a/modules/video_processing_sse2.target.linux-x86.mk +++ b/modules/video_processing_sse2.target.linux-x86.mk @@ -119,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 7425f3df..2aae9934 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 496bd0eb..00ddc8df 100644 --- a/modules/video_render_module.target.darwin-arm.mk +++ b/modules/video_render_module.target.darwin-arm.mk @@ -129,6 +129,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 a7a64340..000ec7f6 100644 --- a/modules/video_render_module.target.darwin-arm64.mk +++ b/modules/video_render_module.target.darwin-arm64.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 66f41fdb..d01e5a95 100644 --- a/modules/video_render_module.target.darwin-mips.mk +++ b/modules/video_render_module.target.darwin-mips.mk @@ -124,6 +124,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 d3f7e65f..c5797f78 100644 --- a/modules/video_render_module.target.darwin-x86.mk +++ b/modules/video_render_module.target.darwin-x86.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 29ca401c..88ef855d 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 496bd0eb..00ddc8df 100644 --- a/modules/video_render_module.target.linux-arm.mk +++ b/modules/video_render_module.target.linux-arm.mk @@ -129,6 +129,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 a7a64340..000ec7f6 100644 --- a/modules/video_render_module.target.linux-arm64.mk +++ b/modules/video_render_module.target.linux-arm64.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 66f41fdb..d01e5a95 100644 --- a/modules/video_render_module.target.linux-mips.mk +++ b/modules/video_render_module.target.linux-mips.mk @@ -124,6 +124,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 d3f7e65f..c5797f78 100644 --- a/modules/video_render_module.target.linux-x86.mk +++ b/modules/video_render_module.target.linux-x86.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 29ca401c..88ef855d 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 0023b4e4..ce889dff 100644 --- a/modules/webrtc_i420.target.darwin-arm.mk +++ b/modules/webrtc_i420.target.darwin-arm.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 f9cc72ee..539fb98b 100644 --- a/modules/webrtc_i420.target.darwin-arm64.mk +++ b/modules/webrtc_i420.target.darwin-arm64.mk @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 2af7e85d..43a7a15f 100644 --- a/modules/webrtc_i420.target.darwin-mips.mk +++ b/modules/webrtc_i420.target.darwin-mips.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 962df1d8..8533400e 100644 --- a/modules/webrtc_i420.target.darwin-x86.mk +++ b/modules/webrtc_i420.target.darwin-x86.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 431ac88e..6ac95fa3 100644 --- a/modules/webrtc_i420.target.darwin-x86_64.mk +++ b/modules/webrtc_i420.target.darwin-x86_64.mk @@ -117,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 0023b4e4..ce889dff 100644 --- a/modules/webrtc_i420.target.linux-arm.mk +++ b/modules/webrtc_i420.target.linux-arm.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 f9cc72ee..539fb98b 100644 --- a/modules/webrtc_i420.target.linux-arm64.mk +++ b/modules/webrtc_i420.target.linux-arm64.mk @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 2af7e85d..43a7a15f 100644 --- a/modules/webrtc_i420.target.linux-mips.mk +++ b/modules/webrtc_i420.target.linux-mips.mk @@ -121,6 +121,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 962df1d8..8533400e 100644 --- a/modules/webrtc_i420.target.linux-x86.mk +++ b/modules/webrtc_i420.target.linux-x86.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 431ac88e..6ac95fa3 100644 --- a/modules/webrtc_i420.target.linux-x86_64.mk +++ b/modules/webrtc_i420.target.linux-x86_64.mk @@ -117,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 26b21aaf..f8ab0b6d 100644 --- a/modules/webrtc_opus.target.darwin-arm.mk +++ b/modules/webrtc_opus.target.darwin-arm.mk @@ -125,6 +125,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 02204298..24335c11 100644 --- a/modules/webrtc_opus.target.darwin-arm64.mk +++ b/modules/webrtc_opus.target.darwin-arm64.mk @@ -112,6 +112,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 060fee56..c281e3f1 100644 --- a/modules/webrtc_opus.target.darwin-mips.mk +++ b/modules/webrtc_opus.target.darwin-mips.mk @@ -120,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 f80cd40d..7f2bd865 100644 --- a/modules/webrtc_opus.target.darwin-x86.mk +++ b/modules/webrtc_opus.target.darwin-x86.mk @@ -117,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 73292c3f..267cd535 100644 --- a/modules/webrtc_opus.target.darwin-x86_64.mk +++ b/modules/webrtc_opus.target.darwin-x86_64.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 26b21aaf..f8ab0b6d 100644 --- a/modules/webrtc_opus.target.linux-arm.mk +++ b/modules/webrtc_opus.target.linux-arm.mk @@ -125,6 +125,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 02204298..24335c11 100644 --- a/modules/webrtc_opus.target.linux-arm64.mk +++ b/modules/webrtc_opus.target.linux-arm64.mk @@ -112,6 +112,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 060fee56..c281e3f1 100644 --- a/modules/webrtc_opus.target.linux-mips.mk +++ b/modules/webrtc_opus.target.linux-mips.mk @@ -120,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 f80cd40d..7f2bd865 100644 --- a/modules/webrtc_opus.target.linux-x86.mk +++ b/modules/webrtc_opus.target.linux-x86.mk @@ -117,6 +117,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 73292c3f..267cd535 100644 --- a/modules/webrtc_opus.target.linux-x86_64.mk +++ b/modules/webrtc_opus.target.linux-x86_64.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 d41b1e9d..9482c505 100644 --- a/modules/webrtc_utility.target.darwin-arm.mk +++ b/modules/webrtc_utility.target.darwin-arm.mk @@ -135,6 +135,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 f7c0801f..cf53ddbc 100644 --- a/modules/webrtc_utility.target.darwin-arm64.mk +++ b/modules/webrtc_utility.target.darwin-arm64.mk @@ -122,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 6161108e..9c64aabb 100644 --- a/modules/webrtc_utility.target.darwin-mips.mk +++ b/modules/webrtc_utility.target.darwin-mips.mk @@ -130,6 +130,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 7a3f02d5..5e92212c 100644 --- a/modules/webrtc_utility.target.darwin-x86.mk +++ b/modules/webrtc_utility.target.darwin-x86.mk @@ -127,6 +127,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 fa453f6c..ab94f406 100644 --- a/modules/webrtc_utility.target.darwin-x86_64.mk +++ b/modules/webrtc_utility.target.darwin-x86_64.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 d41b1e9d..9482c505 100644 --- a/modules/webrtc_utility.target.linux-arm.mk +++ b/modules/webrtc_utility.target.linux-arm.mk @@ -135,6 +135,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 f7c0801f..cf53ddbc 100644 --- a/modules/webrtc_utility.target.linux-arm64.mk +++ b/modules/webrtc_utility.target.linux-arm64.mk @@ -122,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 6161108e..9c64aabb 100644 --- a/modules/webrtc_utility.target.linux-mips.mk +++ b/modules/webrtc_utility.target.linux-mips.mk @@ -130,6 +130,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 7a3f02d5..5e92212c 100644 --- a/modules/webrtc_utility.target.linux-x86.mk +++ b/modules/webrtc_utility.target.linux-x86.mk @@ -127,6 +127,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 fa453f6c..ab94f406 100644 --- a/modules/webrtc_utility.target.linux-x86_64.mk +++ b/modules/webrtc_utility.target.linux-x86_64.mk @@ -126,6 +126,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 3452fd18..854686e4 100644 --- a/modules/webrtc_video_coding.target.darwin-arm.mk +++ b/modules/webrtc_video_coding.target.darwin-arm.mk @@ -148,6 +148,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 bc7daa86..cbd8f740 100644 --- a/modules/webrtc_video_coding.target.darwin-arm64.mk +++ b/modules/webrtc_video_coding.target.darwin-arm64.mk @@ -135,6 +135,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 12841aaf..93ccba9c 100644 --- a/modules/webrtc_video_coding.target.darwin-mips.mk +++ b/modules/webrtc_video_coding.target.darwin-mips.mk @@ -143,6 +143,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 81d3c814..c1cb7d8a 100644 --- a/modules/webrtc_video_coding.target.darwin-x86.mk +++ b/modules/webrtc_video_coding.target.darwin-x86.mk @@ -140,6 +140,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 1778ddb3..f4bec2c8 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 3452fd18..854686e4 100644 --- a/modules/webrtc_video_coding.target.linux-arm.mk +++ b/modules/webrtc_video_coding.target.linux-arm.mk @@ -148,6 +148,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 bc7daa86..cbd8f740 100644 --- a/modules/webrtc_video_coding.target.linux-arm64.mk +++ b/modules/webrtc_video_coding.target.linux-arm64.mk @@ -135,6 +135,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 12841aaf..93ccba9c 100644 --- a/modules/webrtc_video_coding.target.linux-mips.mk +++ b/modules/webrtc_video_coding.target.linux-mips.mk @@ -143,6 +143,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 81d3c814..c1cb7d8a 100644 --- a/modules/webrtc_video_coding.target.linux-x86.mk +++ b/modules/webrtc_video_coding.target.linux-x86.mk @@ -140,6 +140,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS 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 1778ddb3..f4bec2c8 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 087b03e7..ba1cce96 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 15b019d2..ad355204 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 7ee8c357..63d21f22 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 73c46d9c..a5c12e8a 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 ddfc3a35..a8536e93 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 087b03e7..ba1cce96 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 15b019d2..ad355204 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 7ee8c357..63d21f22 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 73c46d9c..a5c12e8a 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 ddfc3a35..a8536e93 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 a5758f7a..39696846 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 97b1e64e..731eab85 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 13310617..1aeeb631 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 b2002797..a2d3d731 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 d59ff036..b9d521de 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 a5758f7a..39696846 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 97b1e64e..731eab85 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 13310617..1aeeb631 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 b2002797..a2d3d731 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 d59ff036..b9d521de 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 9609ca14..7e7e15de 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 71740a4e..4f2208c5 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 9a27a240..3971e705 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 196b9156..726e770c 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 764789a7..fdc3919d 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 9609ca14..7e7e15de 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 71740a4e..4f2208c5 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 9a27a240..3971e705 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 196b9156..726e770c 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 764789a7..fdc3919d 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 d4328e9d..fb22fe3a 100644 --- a/voice_engine/voice_engine.target.darwin-arm.mk +++ b/voice_engine/voice_engine.target.darwin-arm.mk @@ -145,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 39d67250..e60ca855 100644 --- a/voice_engine/voice_engine.target.darwin-arm64.mk +++ b/voice_engine/voice_engine.target.darwin-arm64.mk @@ -132,6 +132,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 f4fc8f1b..c505e51f 100644 --- a/voice_engine/voice_engine.target.darwin-mips.mk +++ b/voice_engine/voice_engine.target.darwin-mips.mk @@ -139,6 +139,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 1ebaa732..2f39989e 100644 --- a/voice_engine/voice_engine.target.darwin-x86.mk +++ b/voice_engine/voice_engine.target.darwin-x86.mk @@ -137,6 +137,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 d7b75d22..861ea41e 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 d4328e9d..fb22fe3a 100644 --- a/voice_engine/voice_engine.target.linux-arm.mk +++ b/voice_engine/voice_engine.target.linux-arm.mk @@ -145,6 +145,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 39d67250..e60ca855 100644 --- a/voice_engine/voice_engine.target.linux-arm64.mk +++ b/voice_engine/voice_engine.target.linux-arm64.mk @@ -132,6 +132,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 f4fc8f1b..c505e51f 100644 --- a/voice_engine/voice_engine.target.linux-mips.mk +++ b/voice_engine/voice_engine.target.linux-mips.mk @@ -139,6 +139,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 1ebaa732..2f39989e 100644 --- a/voice_engine/voice_engine.target.linux-x86.mk +++ b/voice_engine/voice_engine.target.linux-x86.mk @@ -137,6 +137,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 d7b75d22..861ea41e 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 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 4fa9f8c0..fd6eac73 100644 --- a/webrtc.target.darwin-arm.mk +++ b/webrtc.target.darwin-arm.mk @@ -128,6 +128,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 7f521712..21bdd799 100644 --- a/webrtc.target.darwin-arm64.mk +++ b/webrtc.target.darwin-arm64.mk @@ -115,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 54ffbe57..69a80ea8 100644 --- a/webrtc.target.darwin-mips.mk +++ b/webrtc.target.darwin-mips.mk @@ -122,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 bc8b91f7..44e6a452 100644 --- a/webrtc.target.darwin-x86.mk +++ b/webrtc.target.darwin-x86.mk @@ -120,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 14a75128..c8c1b92c 100644 --- a/webrtc.target.darwin-x86_64.mk +++ b/webrtc.target.darwin-x86_64.mk @@ -119,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 4fa9f8c0..fd6eac73 100644 --- a/webrtc.target.linux-arm.mk +++ b/webrtc.target.linux-arm.mk @@ -128,6 +128,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 7f521712..21bdd799 100644 --- a/webrtc.target.linux-arm64.mk +++ b/webrtc.target.linux-arm64.mk @@ -115,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 54ffbe57..69a80ea8 100644 --- a/webrtc.target.linux-mips.mk +++ b/webrtc.target.linux-mips.mk @@ -122,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 bc8b91f7..44e6a452 100644 --- a/webrtc.target.linux-x86.mk +++ b/webrtc.target.linux-x86.mk @@ -120,6 +120,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 14a75128..c8c1b92c 100644 --- a/webrtc.target.linux-x86_64.mk +++ b/webrtc.target.linux-x86_64.mk @@ -119,6 +119,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 3ad3b3c0..10bfcfb2 100644 --- a/webrtc_common.target.darwin-arm.mk +++ b/webrtc_common.target.darwin-arm.mk @@ -122,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 3d0c6c14..0c208222 100644 --- a/webrtc_common.target.darwin-arm64.mk +++ b/webrtc_common.target.darwin-arm64.mk @@ -109,6 +109,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 2c6af893..40b55db8 100644 --- a/webrtc_common.target.darwin-mips.mk +++ b/webrtc_common.target.darwin-mips.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 d2b3a909..d5376183 100644 --- a/webrtc_common.target.darwin-x86.mk +++ b/webrtc_common.target.darwin-x86.mk @@ -114,6 +114,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 54a90b2b..36f9b878 100644 --- a/webrtc_common.target.darwin-x86_64.mk +++ b/webrtc_common.target.darwin-x86_64.mk @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 3ad3b3c0..10bfcfb2 100644 --- a/webrtc_common.target.linux-arm.mk +++ b/webrtc_common.target.linux-arm.mk @@ -122,6 +122,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 3d0c6c14..0c208222 100644 --- a/webrtc_common.target.linux-arm64.mk +++ b/webrtc_common.target.linux-arm64.mk @@ -109,6 +109,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 2c6af893..40b55db8 100644 --- a/webrtc_common.target.linux-mips.mk +++ b/webrtc_common.target.linux-mips.mk @@ -116,6 +116,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 d2b3a909..d5376183 100644 --- a/webrtc_common.target.linux-x86.mk +++ b/webrtc_common.target.linux-x86.mk @@ -114,6 +114,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/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 54a90b2b..36f9b878 100644 --- a/webrtc_common.target.linux-x86_64.mk +++ b/webrtc_common.target.linux-x86_64.mk @@ -113,6 +113,7 @@ MY_DEFS_Debug := \ # Include paths 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 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/third_party \ |