Commit Graph

8 Commits

Author SHA1 Message Date
Henrik Kjellander
10ba3eec5a Roll chromium_revision a12e1e1..0cb2549 (326495:327252)
https://codereview.chromium.org/1051343002 adds a dependency
on Chromium's third_party/junit into base/ which affects our
Android tests that uses that code.

The precompiled JUnit 4.11 JAR file that is only by the
libjingle_peerconnection_java_unittest target on Linux has been
moved to third_party/junit-jar, since it collided with the expected
path for the JUnit dependency mentioned above.
It had to be kept since the Chromium JUnit is only possible to build
when OS==android.

This CL also brings in Mockito and Robolectric, which should be
useful for our Android tests.

Other relevant changes:
* src/buildtools: 3b302fe..15308f4
* src/third_party/libjpeg_turbo: 034e9a9..9e9058b
* src/third_party/libyuv: 32ad6e0..01db3d1
Details: a12e1e1..0cb2549/DEPS

Clang version was not updated in this roll.

BUG=4499
R=phoglund@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#9113}
2015-04-29 12:48:00 +00:00
Henrik Kjellander
d91cb5d5fb Reduce the number of Chromium dependencies synced.
This should save a bunch of disk space but most important
of all it will not sync the Chromium DEPS-pinned copy of WebRTC,
which can be very confusing when using IDEs that indexes all the
source code recursively.

TESTED=
$ rm chromium/.last_sync_chromium
$ rm -rf chromium/src/third_party/webrtc/
$ gclient sync
Verified chromium/src/third_party/webrtc/ didn't come back.

R=pbos@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8910}
2015-04-01 11:30:53 +00:00
kjellander@webrtc.org
bfdee69d48 Roll chromium_revision 9070a80..cd35af6 (313233:314322)
Relevant changes:
* src/third_party/boringssl/src: 347f025..be629e0
* src/third_party/libvpx: 5da40ca..5cdd302
* src/third_party/openmax_dl: 8f7bf0b..c01d587
* src/tools/gyp: b28bd7d..4d7c139
* src/tools/swarming_client: d863df3..c698ea2
Details: 9070a80..cd35af6/DEPS

Clang version was not updated in this roll.
webrtc_tests.py had to be updated to match changes in
https://codereview.chromium.org/882713002

A workaround for grit resources and the addition of V8 to the
Chromium checkout had to be done due to changed
dependencies caused by https://codereview.chromium.org/867073002

R=pbos@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8234}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8234 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-02-03 15:24:22 +00:00
kjellander@webrtc.org
3902054b58 Roll chromium_revision 6455c69..deaf2f7 (293954:295079)
Mainly to pick up recent yasm changes needed for
turning on libvpx in GN.

Summary of changes (git diff 6455c69..deaf2f7 DEPS):
* third_party/boringssl 7bdec13..a70c75c
* third_party/libjpeg_turbo 3963fbc..034e9a9
* third_party/libvpx d95585f..4947d55
* tools/gyp 1972:1977

I had to add src/third_party/junit/src to be ignored
due to http://crbug.com/417292.

BUG=3855, chromium:417292
TBR=pbos@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7313 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-27 18:10:30 +00:00
kjellander@webrtc.org
d57c95fde4 Change Chromium .gclient to not use Managed mode.
Since the sync_chromium.py script always passes --revision
to the gclient sync command, we don't need to have
managed=True in the .gclient file.
This will avoid a warning that confuses our developers.

BUG=3776
TESTED=Removed my chromium/.last_sync_chromium and performed
a gclient sync with this patch applied. No warning complaining
about Managed mode appears.

R=andresp@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7065 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-09-04 14:58:55 +00:00
kjellander@webrtc.org
dc926a000e Avoid syncing unnecessary Chromium deps for WebRTC.
This should save several gigabytes of traffic and disk space.

On Linux this is about 2.6 GB:
346M	src/chrome/tools/test/reference_build
340M	src/native_client
170M	src/third_party/ffmpeg
1.5G	src/third_party/WebKit
196M	src/v8

BUG=2863
TESTED=Removed the directories locally, ran a sync and verified they didn't reappear (or fail because of platform-specific ones).
R=iannucci@chromium.org, niklas.enbom@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6984 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-26 19:22:03 +00:00
kjellander@webrtc.org
c23923447c Roll chromium_revision 289723:291647
To pick up recent fixes after the Chromium Git switch.

Relevant changes pulled in by this roll:
* r291168 refactor sanitizer_options (we can now remove some hacks)
* r291647 roll of nss.gyp (its paths work with how we build for iOS).

BUG=2863,3731
R=iannucci@chromium.org, tommi@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6967 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-25 14:16:32 +00:00
kjellander@webrtc.org
8925662318 Make WebRTC work with Chromium Git checkouts
WebRTC standalone shares a lot of dependencies and build
tools with Chromium. To make the build work, many of the
paths of a Chromium checkout is now emulated by creating
symlinks to files and directories.

All DEPS entries that previously used Var("chromium_trunk")
to reference a Chromium checkout or From("chromium_deps"..)
to reference the Chromium DEPS file are now removed and
replaced by symlink entries in setup_links.py.

The script also handles cleanup of the legacy
Subversion-based dependencies that's needed for the
transition.

Windows: One Windows-specific important change is that
gclient sync|runhooks must now be run from a shell
with Administrator privileges in order to be able to create
symlinks. This also means that Windows XP is no longer
supported.

To transition a previously created checkout:
Run "python setup_links.py --force" to cleanup the old
SVN-based dependencies that have been synced by gclient sync.
For Buildbots, the --force flag is automatically enabled for
their syncs.

BUG=2863, chromium:339647
TEST=Manual testing on Linux, Mac and Windows.
R=andrew@webrtc.org, iannucci@chromium.org, phoglund@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6938 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-08-20 12:10:11 +00:00