aboutsummaryrefslogtreecommitdiff
path: root/talk
diff options
context:
space:
mode:
authortommi <tommi@webrtc.org>2016-01-13 08:12:00 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-13 16:12:07 +0000
commitfca54f41ad1b5b2189d123fe8e97f3ff9b457336 (patch)
tree133e3f50719f207d8d9e85ec948d2d59d5dd5671 /talk
parent09d944f82db00686dc9f364628f906d3cc106707 (diff)
downloadwebrtc-fca54f41ad1b5b2189d123fe8e97f3ff9b457336.tar.gz
Revert of Use an explicit identifier in Config (patchset #4 id:60001 of https://codereview.webrtc.org/1538643004/ )
Reason for revert: Reverting due to problem with roll: /b/build/slave/linux/build/src/buildtools/linux64/gn gen //out/Release '--args=ffmpeg_branding="Chrome" proprietary_codecs=true is_debug=false is_component_build=false use_goma=true goma_dir="/b/build/goma" symbol_level=1 dcheck_always_on=true' --check --runtime-deps-list-file=/b/build/slave/linux/build/src/out/Release/runtime_deps -> returned 1 ERROR at //third_party/webrtc/BUILD.gn:245:18: Item not found configs -= [ "//build/config/clang:find_bad_constructs" ] ^----------------------------------------- You were trying to remove "//build/config/clang:find_bad_constructs" from the list but it wasn't there. GN gen failed: 1 step returned non-zero exit code: 1 @@@STEP_FAILURE@@@ Original issue's description: > 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. > > Committed: https://crrev.com/25249d92d3cf105bcc7b684c8924ccdbc9afcb93 > Cr-Commit-Position: refs/heads/master@{#11231} TBR=henrik.lundin@webrtc.org,stefan@webrtc.org,tommi@chromium.org,aluebs@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.webrtc.org/1586563003 Cr-Commit-Position: refs/heads/master@{#11239}
Diffstat (limited to 'talk')
-rwxr-xr-xtalk/libjingle.gyp6
1 files changed, 0 insertions, 6 deletions
diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp
index 6e0f8a3424..da7f80b60d 100755
--- a/talk/libjingle.gyp
+++ b/talk/libjingle.gyp
@@ -712,16 +712,10 @@
'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',