Fixes: Resolves conflict that will happen when merging libjingle's and WebRTC's supplemental.gyp. By separating build_with_chromium and build_with_libjingle one can now just define build_with_libjingle in libjingle's supplemental.gyp. Once that is done it will be possible to merge the two supplemental.gyp-files. I.e. in WebRTC the supplemental.gyp would only set build_with_chromium to 0 since there is no longer any reason to disable logging and tests as they will be accessible in the same repository as libjingle.
Libjingle sets the variables here: https://code.google.com/p/libjingle/source/browse/trunk/talk/supplement.gypi
BUG=N/A
R=andrew@webrtc.org, fischman@webrtc.org, wu@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1787005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4354 4adac7df-926f-26a2-2b94-8c16560cd09d
2 files changed