Move JUnit to 'unix' condition in DEPS.

Move JUnit to 'unix' condition in DEPS.

This makes it possible to use the JUnit library from
Java code on Linux.

BUG=webrtc:4499
Committed: https://crrev.com/0cb254911980cce90b2e5c7207a37a27420e9ea7
Cr-Commit-Position: refs/heads/master@{#327252}

[kjellander_chromium, 2015-04-27 12:23:03]

kjellander@chromium.org changed reviewers:
+ dgn@chromium.org, jbudorick@chromium.org

[kjellander_chromium, 2015-04-27 12:23:04]

Hi,
I realize this is not ideal but it would avoid hacky workarounds for WebRTC
since we use JUnit in Linux tests in addition to Android.
 
We use the Chromium Android toolchain for all our Android tests, and because of
that we now have to use Chromium's JUnit since it was introduced as a dependency
in https://codereview.chromium.org/1051343002. Until now we've been using a
pre-compiled JAR file, which we also would be happy to get rid off.

We want to stay in sync with all the dependencies in Chromium and use the same
revisions (we pin a Chromium revision in WebRTC's DEPS file and use the same
dependencies).

Changing JUnit to be checked out for all Linux (non-Android) bots only adds 16MB
to the checkout.

[jbudorick, 2015-04-27 13:08:16]

On 2015/04/27 12:23:04, kjellander wrote:
> Hi,
> I realize this is not ideal but it would avoid hacky workarounds for WebRTC
> since we use JUnit in Linux tests in addition to Android.
>  
> We use the Chromium Android toolchain for all our Android tests, and because
of
> that we now have to use Chromium's JUnit since it was introduced as a
dependency
> in https://codereview.chromium.org/1051343002. Until now we've been using a
> pre-compiled JAR file, which we also would be happy to get rid off.
> 
> We want to stay in sync with all the dependencies in Chromium and use the same
> revisions (we pin a Chromium revision in WebRTC's DEPS file and use the same
> dependencies).
> 
> Changing JUnit to be checked out for all Linux (non-Android) bots only adds
16MB
> to the checkout.

I'm not too familiar with the "unix" section of the DEPS file. When you say "all
Linux (non-Android) bots," does that mean that moving JUnit to 'unix' stops
checking out JUnit for android? Or that that's the delta since we're already
checking it out on android?

[kjellander_chromium, 2015-04-27 13:19:04]

On 2015/04/27 13:08:16, jbudorick wrote:
> On 2015/04/27 12:23:04, kjellander wrote:
> > Hi,
> > I realize this is not ideal but it would avoid hacky workarounds for WebRTC
> > since we use JUnit in Linux tests in addition to Android.
> >  
> > We use the Chromium Android toolchain for all our Android tests, and because
> of
> > that we now have to use Chromium's JUnit since it was introduced as a
> dependency
> > in https://codereview.chromium.org/1051343002. Until now we've been using a
> > pre-compiled JAR file, which we also would be happy to get rid off.
> > 
> > We want to stay in sync with all the dependencies in Chromium and use the
same
> > revisions (we pin a Chromium revision in WebRTC's DEPS file and use the same
> > dependencies).
> > 
> > Changing JUnit to be checked out for all Linux (non-Android) bots only adds
> 16MB
> > to the checkout.
> 
> I'm not too familiar with the "unix" section of the DEPS file. When you say
"all
> Linux (non-Android) bots," does that mean that moving JUnit to 'unix' stops
> checking out JUnit for android? Or that that's the delta since we're already
> checking it out on android?

Since the host OS for all Android builders is Linux, the unix section will be
processed unless the target_os_only
(https://code.google.com/p/chromium/codesearch#chromium/tools/depot_tools/gcli...)
is specified. Since it's usually not (I believe only some iOS builds use that),
they will be processed, even if target_os =  ["android"] is in .gclient.

I've verified that with a local checkout with that configured in .gclient as
well.

[jbudorick, 2015-04-27 13:20:31]

On 2015/04/27 13:19:04, kjellander wrote:
> On 2015/04/27 13:08:16, jbudorick wrote:
> > On 2015/04/27 12:23:04, kjellander wrote:
> > > Hi,
> > > I realize this is not ideal but it would avoid hacky workarounds for
WebRTC
> > > since we use JUnit in Linux tests in addition to Android.
> > >  
> > > We use the Chromium Android toolchain for all our Android tests, and
because
> > of
> > > that we now have to use Chromium's JUnit since it was introduced as a
> > dependency
> > > in https://codereview.chromium.org/1051343002. Until now we've been using
a
> > > pre-compiled JAR file, which we also would be happy to get rid off.
> > > 
> > > We want to stay in sync with all the dependencies in Chromium and use the
> same
> > > revisions (we pin a Chromium revision in WebRTC's DEPS file and use the
same
> > > dependencies).
> > > 
> > > Changing JUnit to be checked out for all Linux (non-Android) bots only
adds
> > 16MB
> > > to the checkout.
> > 
> > I'm not too familiar with the "unix" section of the DEPS file. When you say
> "all
> > Linux (non-Android) bots," does that mean that moving JUnit to 'unix' stops
> > checking out JUnit for android? Or that that's the delta since we're already
> > checking it out on android?
> 
> Since the host OS for all Android builders is Linux, the unix section will be
> processed unless the target_os_only
>
(https://code.google.com/p/chromium/codesearch#chromium/tools/depot_tools/gcli...)
> is specified. Since it's usually not (I believe only some iOS builds use
that),
> they will be processed, even if target_os =  ["android"] is in .gclient.
> 
> I've verified that with a local checkout with that configured in .gclient as
> well.

ah, ok.

lgtm

[kjellander_chromium, 2015-04-28 08:26:04]

kjellander@chromium.org changed reviewers:
+ phajdan.jr@chromium.org

[kjellander_chromium, 2015-04-28 08:26:05]

phajdan.jr@chromium.org: Please review changes in
tools/checklicenses/checklicenses.py

[Paweł Hajdan Jr., 2015-04-28 08:51:23]

LGTM

[kjellander_chromium, 2015-04-28 09:09:03]

The CQ bit was checked by kjellander@chromium.org

[kjellander_chromium, 2015-04-28 09:09:04]

The patchset sent to the CQ was uploaded after l-g-t-m from
jbudorick@chromium.org
Link to the patchset: https://codereview.chromium.org/1106973002/#ps20001
(title: "Add checklicenses.py whitelisting")

[commit-bot: I haz the power, 2015-04-28 09:09:36]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1106973002/20001

[commit-bot: I haz the power, 2015-04-28 09:38:19]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2015-04-28 09:39:10]

Patchset 2 (id:??) landed as
https://crrev.com/0cb254911980cce90b2e5c7207a37a27420e9ea7
Cr-Commit-Position: refs/heads/master@{#327252}