aboutsummaryrefslogtreecommitdiff
path: root/talk
diff options
context:
space:
mode:
authoraluebs <aluebs@webrtc.org>2016-01-14 04:32:46 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-14 12:32:51 +0000
commit688e308a353c27803a66803230235638f4dd1f2b (patch)
tree53172ae9e65a838e5123b7b8c7c8bb27e3b527f9 /talk
parent7307952a5bf63311e5f9a2a90089a06177e42716 (diff)
downloadwebrtc-688e308a353c27803a66803230235638f4dd1f2b.tar.gz
Re-land: "Use an explicit identifier in Config"
This let's us use them to configure them when using WebRTC as an external library. One use case where this is necessary is in the Android OS. Original CL: https://codereview.webrtc.org/1538643004/ TBR=tommi@webrtc.org Review URL: https://codereview.webrtc.org/1589573004 Cr-Commit-Position: refs/heads/master@{#11248}
Diffstat (limited to 'talk')
-rwxr-xr-xtalk/libjingle.gyp6
1 files changed, 6 insertions, 0 deletions
diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp
index da7f80b60d..6e0f8a3424 100755
--- a/talk/libjingle.gyp
+++ b/talk/libjingle.gyp
@@ -712,10 +712,16 @@
'include_dirs': [
'<(DEPTH)/testing/gtest/include',
],
+ 'include_dirs!': [
+ '<(DEPTH)/webrtc',
+ ],
'direct_dependent_settings': {
'include_dirs': [
'<(DEPTH)/testing/gtest/include',
],
+ 'include_dirs!': [
+ '<(DEPTH)/webrtc',
+ ],
},
'sources': [
'session/media/audiomonitor.cc',