Import Jack and Jill Carnac 1.2-a25
Jack version: 290002 e22c92bfa28309722002acbd7e32b0d15ba3941d
Jill version: 290002 e22c92bfa28309722002acbd7e32b0d15ba3941d
Bugs fixed since 1.2-a24:
Bug: 27717048
Bug: 27641976
Bug: 27217006
Bug: 27620766
Bug: 27605155
Bug: 27641610
Bug: 27636368
Change-Id: Iba5bfcc4416d10e565f3d0b98a0eb921a2bc9c06
diff --git a/tools/jack b/tools/jack
index 4b4b9b2..9fdfffb 100755
--- a/tools/jack
+++ b/tools/jack
@@ -22,7 +22,7 @@
#
# Settings
#
-JACK_VERSION=${JACK_VERSION:=3.24.ALPHA}
+JACK_VERSION=${JACK_VERSION:=3.25.ALPHA}
JACK_HOME="${JACK_HOME:=$HOME/.jack-server}"
CLIENT_SETTING="${CLIENT_SETTING:=$HOME/.jack-settings}"
TMPDIR=${TMPDIR:=/tmp}
diff --git a/tools/jack-jacoco-reporter.jar b/tools/jack-jacoco-reporter.jar
index b3cf943..404b6c8 100644
--- a/tools/jack-jacoco-reporter.jar
+++ b/tools/jack-jacoco-reporter.jar
Binary files differ
diff --git a/tools/jack_versions.mk b/tools/jack_versions.mk
index 691414c..43c2127 100644
--- a/tools/jack_versions.mk
+++ b/tools/jack_versions.mk
@@ -14,10 +14,10 @@
# limitations under the License.
#
-JACK_STABLE_VERSION := 3.24.ALPHA
-JACK_DOGFOOD_VERSION := 3.24.ALPHA
-JACK_SDKTOOL_VERSION := 3.24.ALPHA
-JACK_LANG_DEV_VERSION := 3.24.ALPHA
+JACK_STABLE_VERSION := 3.25.ALPHA
+JACK_DOGFOOD_VERSION := 3.25.ALPHA
+JACK_SDKTOOL_VERSION := 3.25.ALPHA
+JACK_LANG_DEV_VERSION := 3.25.ALPHA
ifneq ($(ANDROID_JACK_DEFAULT_VERSION),)
JACK_DEFAULT_VERSION := $(JACK_$(ANDROID_JACK_DEFAULT_VERSION)_VERSION)
diff --git a/tools/jacks/jack-3.24.ALPHA.jar b/tools/jacks/jack-3.25.ALPHA.jar
similarity index 88%
rename from tools/jacks/jack-3.24.ALPHA.jar
rename to tools/jacks/jack-3.25.ALPHA.jar
index c630108..1e2bddc 100644
--- a/tools/jacks/jack-3.24.ALPHA.jar
+++ b/tools/jacks/jack-3.25.ALPHA.jar
Binary files differ
diff --git a/tools/jills/jill-3.24.ALPHA.jar b/tools/jills/jill-3.25.ALPHA.jar
similarity index 89%
rename from tools/jills/jill-3.24.ALPHA.jar
rename to tools/jills/jill-3.25.ALPHA.jar
index 3c9220f..55bc952 100644
--- a/tools/jills/jill-3.24.ALPHA.jar
+++ b/tools/jills/jill-3.25.ALPHA.jar
Binary files differ
