Commit Graph

4 Commits

Author SHA1 Message Date
andrew@webrtc.org
a5586b50e5 Protect ENABLE_PROFILING to fix profiling=1.
Chromium defines ENABLE_PROFILING under the gyp flag profiling=1. This
corrects the resulting mulitple defintion error:
../../talk/base/profiler.h:61:9: error: 'ENABLE_PROFILING' macro redefined [-Werror]
#define ENABLE_PROFILING

and allows us to use profiling=1 in standalone builds.

TESTED=build passes with profiling=1
R=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/10829004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5804 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-03-27 22:44:13 +00:00
wu@webrtc.org
cecfd1832d Update talk to 55821645.
TEST=try bots
R=mallinath@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/3139004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5053 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-10-30 05:18:12 +00:00
wu@webrtc.org
7818752566 Update libjingle to 53856368.
R=mallinath@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2366004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4941 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-10-07 23:32:02 +00:00
henrike@webrtc.org
28e2075280 Adds trunk/talk folder of revision 359 from libjingles google code to
trunk/talk


git-svn-id: http://webrtc.googlecode.com/svn/trunk@4318 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-10 00:45:36 +00:00