Commit 8be2c3f7 authored by thestig's avatar thestig Committed by Commit bot

Revert of Revert of Revert of Set the javac target and source to 1.7 (patchset...

Revert of Revert of Revert of Set the javac target and source to 1.7 (patchset #1 id:1 of https://codereview.chromium.org/601983002/)

Reason for revert:
Broke Android bots:
http://build.chromium.org/p/chromium.linux/builders/Android%20Arm64%20Builder%20%28dbg%29/builds/2225
http://build.chromium.org/p/chromium.linux/builders/Android%20Builder%20%28dbg%29/builds/66337

Original issue's description:
> Revert of Revert of Set the javac target and source to 1.7 (patchset #1 id:1 of https://chromiumcodereview.appspot.com/579543003/)
>
> Reason for revert:
> All the bots have been switched to Java 7 according to https://code.google.com/p/chromium/issues/detail?id=411503#c19
>
> Original issue's description:
> > Revert of Set the javac target and source to 1.7 (patchset #2 id:20001 of https://chromiumcodereview.appspot.com/545363002/)
> >
> > Reason for revert:
> > Not all bots have Java 7 yet :(
> >
> > Original issue's description:
> > > Set the javac target and source to 1.7
> > >
> > > BUG=336589
> > > TBR=yfriedman@chromium.org
> > >
> > > Committed: https://crrev.com/165c0f17fe5760a3f346940d4fb2574d62cfe53b
> > > Cr-Commit-Position: refs/heads/master@{#295162}
> >
> > TBR=cjhopman@chromium.org,yfriedman@chromium.org
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=336589
> >
> > Committed: https://crrev.com/094138696e943744d1489ebb98276b116eafed99
> > Cr-Commit-Position: refs/heads/master@{#295165}
>
> TBR=cjhopman@chromium.org,yfriedman@chromium.org
> BUG=336589
>
> Committed: https://crrev.com/119c6fa8247481d2e36910d30175d0214fd2ece5
> Cr-Commit-Position: refs/heads/master@{#296630}

TBR=cjhopman@chromium.org,yfriedman@chromium.org,aurimas@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=336589

Review URL: https://codereview.chromium.org/603833002

Cr-Commit-Position: refs/heads/master@{#296632}
parent 36f3bce5
...@@ -17,14 +17,12 @@ import java.util.HashSet; ...@@ -17,14 +17,12 @@ import java.util.HashSet;
public final class CollectionUtil { public final class CollectionUtil {
private CollectionUtil() {} private CollectionUtil() {}
@SafeVarargs
public static <E> HashSet<E> newHashSet(E... elements) { public static <E> HashSet<E> newHashSet(E... elements) {
HashSet<E> set = new HashSet<E>(elements.length); HashSet<E> set = new HashSet<E>(elements.length);
Collections.addAll(set, elements); Collections.addAll(set, elements);
return set; return set;
} }
@SafeVarargs
public static <E> ArrayList<E> newArrayList(E... elements) { public static <E> ArrayList<E> newArrayList(E... elements) {
ArrayList<E> list = new ArrayList<E>(elements.length); ArrayList<E> list = new ArrayList<E>(elements.length);
Collections.addAll(list, elements); Collections.addAll(list, elements);
......
...@@ -72,8 +72,8 @@ def DoJavac( ...@@ -72,8 +72,8 @@ def DoJavac(
javac_args = [ javac_args = [
'-g', '-g',
'-source', '1.7', '-source', '1.5',
'-target', '1.7', '-target', '1.5',
'-classpath', ':'.join(classpath), '-classpath', ':'.join(classpath),
'-d', classes_dir] '-d', classes_dir]
if chromium_code: if chromium_code:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment