Import Jack and Jill Carnac 1.2-a24
Jack version: 283001 7e39a352cafc1eb3b4ae95846a101b93ccbc9cf0
Jill version: 283001 7e39a352cafc1eb3b4ae95846a101b93ccbc9cf0
Bug fixed since 1.2-a23:
Bug: 27609175
(cherry picked from commit 87eb80848e63df52d868f62e367491da4d39de63)
Change-Id: I0bc6044bd08985b020af8b30ede072ecc1ae9db1
diff --git a/tools/jack b/tools/jack
index b200280..4b4b9b2 100755
--- a/tools/jack
+++ b/tools/jack
@@ -22,7 +22,7 @@
#
# Settings
#
-JACK_VERSION=${JACK_VERSION:=3.23.ALPHA}
+JACK_VERSION=${JACK_VERSION:=3.24.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 e11b509..b3cf943 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 b49dec1..dc02160 100644
--- a/tools/jack_versions.mk
+++ b/tools/jack_versions.mk
@@ -14,10 +14,10 @@
# limitations under the License.
#
-JACK_STABLE_VERSION := 2.28.RELEASE
-JACK_DOGFOOD_VERSION := 3.23.ALPHA
-JACK_CANARY_VERSION := 3.23.ALPHA
-JACK_LANG_DEV_VERSION := 3.23.ALPHA
+JACK_STABLE_VERSION := 3.24.ALPHA
+JACK_DOGFOOD_VERSION := 3.24.ALPHA
+JACK_CANARY_VERSION := 3.24.ALPHA
+JACK_LANG_DEV_VERSION := 3.24.ALPHA
ifneq ($(ANDROID_JACK_DEFAULT_VERSION),)
JACK_DEFAULT_VERSION := $(JACK_$(ANDROID_JACK_DEFAULT_VERSION)_VERSION)
diff --git a/tools/jacks/jack-3.23.ALPHA.jar b/tools/jacks/jack-3.24.ALPHA.jar
similarity index 91%
rename from tools/jacks/jack-3.23.ALPHA.jar
rename to tools/jacks/jack-3.24.ALPHA.jar
index 602b4f6..c630108 100644
--- a/tools/jacks/jack-3.23.ALPHA.jar
+++ b/tools/jacks/jack-3.24.ALPHA.jar
Binary files differ
diff --git a/tools/jill.jar b/tools/jill.jar
index 51202a5..3c9220f 100644
--- a/tools/jill.jar
+++ b/tools/jill.jar
Binary files differ