commit eda82090bfbc65d59933562737d077a1c2f16e55
author Xin Li <delphij@google.com> Tue Jan 31 15:55:17 2017 -0800
committer Xin Li <delphij@google.com> Tue Jan 31 15:55:39 2017 -0800
tree ce8eb15ec1c30922d6f2e4ee29e2884ed2249f1a
parent 6432f6a84d0e42152929b3904c242959b4c0d66a
parent eb7ba88b5b2712c94b22230042ad30b894eb0271

Merge stage-aosp-master into master.

BUG: 34107289
Change-Id: I7910cf453ea67f7029812db1df54bdf1d399c0cd

BUILD

diff --git a/BUILD b/BUILD
index 0f17c81..842d1b7 100644
--- a/BUILD
+++ b/BUILD
@@ -1,5 +1,47 @@
+#######
+# Gradle 2.14.1
+#######
+
 filegroup(
-    name = "gradle",
+    name = "gradle-2.14.1",
     srcs = ["gradle-2.14.1-bin.zip"],
     visibility = ["//visibility:public"],
 )
+
+# gradle-api jar, as generated by gradle when using the gradleApi() magic dependency.
+java_import(
+    name = "gradle-api-2.14.1",
+    jars = ["gradle-api-2.14.1.jar"],
+    visibility = ["//visibility:public"],
+)
+
+java_library(
+    name = "gradle-api-2.14.1_neverlink",
+    neverlink = 1,
+    exports = [":gradle-api-2.14.1"],
+    visibility = ["//visibility:public"],
+)
+
+#######
+# gradle 3.2
+#######
+
+filegroup(
+    name = "gradle-3.2",
+    srcs = ["gradle-3.2-bin.zip"],
+    visibility = ["//visibility:public"],
+)
+
+# gradle-api jar, as generated by gradle when using the gradleApi() magic dependency.
+java_import(
+    name = "gradle-api-3.2",
+    jars = ["gradle-api-3.2.jar"],
+    visibility = ["//visibility:public"],
+)
+
+java_library(
+    name = "gradle-api-3.2_neverlink",
+    neverlink = 1,
+    exports = [":gradle-api-3.2"],
+    visibility = ["//visibility:public"],
+)

PREBUILT

diff --git a/PREBUILT b/PREBUILT
index 7c45223..000c68d 100644
--- a/PREBUILT
+++ b/PREBUILT
@@ -15,4 +15,4 @@
 https://services.gradle.org/distributions/gradle-2.14-bin.zip
 https://services.gradle.org/distributions/gradle-2.14.1-bin.zip
 https://services.gradle.org/distributions/gradle-3.0-all.zip
-https://services.gradle.org/distributions/gradle-3.1-bin.zip
+https://services.gradle.org/distributions/gradle-3.2-bin.zip

gradle-3.1-bin.zip

diff --git a/gradle-3.1-bin.zip b/gradle-3.1-bin.zip
deleted file mode 100644
index f4b73af..0000000
--- a/gradle-3.1-bin.zip
+++ /dev/null
Binary files differ

gradle-3.2-bin.zip

diff --git a/gradle-3.2-bin.zip b/gradle-3.2-bin.zip
new file mode 100644
index 0000000..0ffb0cb
--- /dev/null
+++ b/gradle-3.2-bin.zip
Binary files differ

gradle-api-2.14.1.jar

diff --git a/gradle-api-2.14.1.jar b/gradle-api-2.14.1.jar
new file mode 100644
index 0000000..a365aa4
--- /dev/null
+++ b/gradle-api-2.14.1.jar
Binary files differ

gradle-api-3.2.jar

diff --git a/gradle-api-3.2.jar b/gradle-api-3.2.jar
new file mode 100644
index 0000000..89d4361
--- /dev/null
+++ b/gradle-api-3.2.jar
Binary files differ