Commit Graph

22 Commits

Author SHA1 Message Date
kjellander@webrtc.org
c2c94a9a9f Change default JVM location to /usr/lib/jvm/java-7-openjdk-amd64
Given that OpenJDK 1.7 is the recommended Java SDK for
Chromium these days, we should get rid of linking to the old
non-standardized link referring to a Sun Java 1.6 SDK.

Instead of requiring all users to set JAVA_HOME, I prefer
have the most common path as default and and close webrtc:2113
as won't fix after this is submitted.

BUG=2113
R=henrike@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7584 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-10-31 19:01:41 +00:00
pbos@webrtc.org
d60d79a145 Thread annotation of rtc::CriticalSection.
Effectively re-lands r5516 which was reverted because talk/-only
checkouts existed. This now resides in webrtc/base/, so no talk/-only
checkouts should be possible.

This change also enables -Wthread-safety for talk/ and fixes a bug in
talk/media/webrtc/webrtcvideoengine2.cc where a guarded variable was
read without taking the corresponding lock.

R=andresp@webrtc.org, mflodman@webrtc.org, pthatcher@webrtc.org
BUG=

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7284 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-24 07:10:57 +00:00
henrike@webrtc.org
6ac22e6b47 Remove more dependencies on openssl, add dependency on boringssl. Continues on r6798
R=andrew@webrtc.org, fbarchard@chromium.org, kjellander@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6867 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-11 21:06:30 +00:00
fbarchard@google.com
48305f5f4c Disable warning 4702 which affects map, xlist and others on vs2012 and vs2013.
BUG=3584
TESTED=python webrtc\build\gyp_webrtc -G msvs_version=2013 & ninja -C out\Release
R=pthatcher@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6801 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-30 00:16:20 +00:00
buildbot@webrtc.org
d4e598d57a (Auto)update libjingle 72097588-> 72159069
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6799 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-29 17:36:52 +00:00
tkchin@webrtc.org
b038c72369 Enable SCTP compile for iOS.
Chromium's been updated to pull a version of usrsctplib that will compile correctly. This update DEPS to point at new revision and turn on the compile time flags for iOS sctp.

BUG=3211
R=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6681 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-14 20:24:09 +00:00
buildbot@webrtc.org
55535d4e58 (Auto)update libjingle 70711261-> 70733822
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6627 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-07-08 18:18:55 +00:00
kjellander@webrtc.org
1014101470 Revert 6380 "Replace libjingle_root with talk_root variable."
It turns out this doesn't fix the problem we're trying to solve...

> Replace libjingle_root with talk_root variable.
> 
> This CL is similar to https://review.webrtc.org/9019004/
> It is needed in order to be able to build with different
> copies of libjingle. Having the libjingle_root variable didn't
> make this possible, since relative paths in the .isolate files
> ended up at the wrong directory level and .isolate files doesn't
> support all the normal GYP variables like <(DEPTH).
> 
> BUG=chromium:343106
> TEST=trybots passing compile step with clobber.
> R=tommi@webrtc.org, wu@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/15709004

TBR=kjellander@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6384 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-10 10:13:38 +00:00
kjellander@webrtc.org
0238682984 Replace libjingle_root with talk_root variable.
This CL is similar to https://review.webrtc.org/9019004/
It is needed in order to be able to build with different
copies of libjingle. Having the libjingle_root variable didn't
make this possible, since relative paths in the .isolate files
ended up at the wrong directory level and .isolate files doesn't
support all the normal GYP variables like <(DEPTH).

BUG=chromium:343106
TEST=trybots passing compile step with clobber.
R=tommi@webrtc.org, wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6380 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-10 05:46:31 +00:00
pbos@webrtc.org
174a67439b Enable -Wall, -Wextra and -Wunused-variable for talk/ on clang.
Also removes one case of unused-variable.

BUG=3220
R=henrike@webrtc.org, kjellander@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6297 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-02 07:58:30 +00:00
fischman@webrtc.org
b25576a75b talk/: enable _DEBUG in Debug for all posix
Chromium's build/common.gypi defines _DEBUG for Debug builds _except_ on
(OS=="mac" OS=="ios").  But libjingle uses _DEBUG on all platforms so define it on all posix (chromium covers non-posix separately and fine).

BUG=webrtc:3101
R=juberti@google.com

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5795 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-03-26 21:53:47 +00:00
kjellander@webrtc.org
cf85f1cf3c Reorganize libjingle path variables.
BUG=chromium:343106
TEST=Trybots passing. I also successfully ran build/gyp_chromium and built Chromium with the talk/build/common.gypi modification in the checkout.
R=andrew@webrtc.org, wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5644 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-03-05 00:40:33 +00:00
wjia@webrtc.org
dd82fa726c Revert 5516 "Thread annotation of talk_base::CriticalSection."
r5516 failed compilation on builds with enable_webrtc=0.

> Thread annotation of talk_base::CriticalSection.
> 
> Also enabling -Wthread-safety in talk/build/common.gypi for clang on
> Linux. Thread annotations are compile-time checks that for instance
> certain locks are held before accessing a value.
> 
> BUG=
> TEST=Local GUARDED_BY() annotations.
> R=andresp@webrtc.org, fischman@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/8189004

TBR=pbos@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5523 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-02-10 23:20:15 +00:00
pbos@webrtc.org
0a7085ffc2 Thread annotation of talk_base::CriticalSection.
Also enabling -Wthread-safety in talk/build/common.gypi for clang on
Linux. Thread annotations are compile-time checks that for instance
certain locks are held before accessing a value.

BUG=
TEST=Local GUARDED_BY() annotations.
R=andresp@webrtc.org, fischman@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5516 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-02-10 13:58:37 +00:00
jiayl@webrtc.org
a576faf82a Enable SCTP and use OPENSSL on Anroid and NSS on other platforms.
It includes unit test fixes to properly initialize SSL if DTLS or SSL random number generator is used in the tests.
The private key and certificate constant strings used in some tests are updated to be compatible with NSS.
A few potentially overflow type conversions caused compiling warning on Windows and they are fixed by importing and using Chromium's checked_cast, which aborts the program if overflow occurs.
It also fixes a leak in nssstreamadapter.cc by releasing the PRFileDesc* in StreamClose.

BUG=2253
R=fischman@webrtc.org, juberti@google.com, wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5459 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-01-29 17:45:53 +00:00
fischman@webrtc.org
e3de6b1e90 Enable ObjC build by default and reenable 64-bit mac libjingle build
BUG=2124
TESTED=trybots & building for mac, mac64, ios-sim, and ios-device on my MBP all build everything in out/Debug.
R=niklas.enbom@webrtc.org, wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4620 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-08-26 19:31:21 +00:00
fischman@webrtc.org
dd14b2add1 libjingle gyp: signal errors during gyp time to avoid cryptic failures during build time.
- $JAVA_HOME / java_home missing or not pointing to a JDK
- Multiple or zero mac codesigning identities

BUG=2206
R=henrike@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4527 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-08-12 18:06:29 +00:00
fischman@webrtc.org
1bc1954174 AppRTCDemo: builds using ninja on iOS for simulator and device!
Things included in this CL:
- updated READMEs to provide an exact/reproable set of steps for getting the app
  running.
- gyp changes to build the iOS AppRTCDemo sample app using gyp+ninja instead of
  the hand-crafted Xcode project (which has never worked in its checked-in
  form), including a gyp action to sign the sample app for deployment to an iOS
  device (the app can also be used in the simulator)
- deleted the busted hand-crafted Xcode project for the sample app
- updated the sample app to match the PeerConnection API that ended up landing
  (in a surprising twist of fate, the API landed quite a bit later than the
  sample app and this is the first time the CR-time changes in the API are
  reflected in the sample app)
- updated the sample app to reflect apprtc.appspot.com HTML/JS changes (equiv to
  the AppRTCClient.java changes in http://s10/47299162)
- picked up the iossim DEPS to enable launching the sample app in the simulator
  from the command-line.
- renamed some files to match capitalization of the classes they contain (Ice ->
  ICE) per ObjC naming guidelines.
- ran the files involved in this CL through clang-format to deal with xcode
  formatting craxy.

BUG=2106
RISK=P2
TESTED=unittest builds with ninja and passes on OS=mac; sample app builds with ninja and runs on simulator and device, though no audio flows from simulator/device (will fix in a follow-up CL)
R=andrew@webrtc.org, justincohen@google.com, wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4466 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-08-01 18:29:45 +00:00
henrike@webrtc.org
28654cbc22 Update talk folder to revision=49713299.
TBR=mallinath@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4380 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-22 21:07:49 +00:00
henrike@webrtc.org
9de257d00f Update talk folder to revision=49470012. Same as 375 in libjingle's google code repository.
TBR=wu@webrtc.org

BUG=N/A

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4364 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-17 14:42:53 +00:00
henrike@webrtc.org
723d683ecb Update talk folder to revision=49260075. Same as 369 in libjingle's google code repository.
TBR=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4338 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-12 16:04:50 +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