summaryrefslogtreecommitdiff
path: root/modules/webrtc_opus.target.linux-x86_64.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-06-16 14:50:41 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-06-16 14:50:41 +0000
commitcb4fdd1fdaaf2c11d40d3aeb3d5f62127230a6cc (patch)
tree3abed7548a0a9be7856a740dbee91dfa411dc17c /modules/webrtc_opus.target.linux-x86_64.mk
parentc7fcada57f3f930a6efb5d57ff2931e8d9c12041 (diff)
downloadwebrtc-cb4fdd1fdaaf2c11d40d3aeb3d5f62127230a6cc.tar.gz
Update makefiles after merge of Chromium at 277428
This commit was generated by merge_from_chromium.py. Change-Id: I35c59b36614d836accbb543178393a6c061586f1
Diffstat (limited to 'modules/webrtc_opus.target.linux-x86_64.mk')
-rw-r--r--modules/webrtc_opus.target.linux-x86_64.mk2
1 files changed, 2 insertions, 0 deletions
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 \