Merge "Import Jack and Jill Douarn 1.3-b16 as Stable" am: 760a6e1609 am: e36dd7b2f1
am: 80a7561123
Change-Id: I73b0344f85ded6ca11abb3a670de9732b7db7d1c
diff --git a/tools/jack b/tools/jack
index e89d554..8337183 100755
--- a/tools/jack
+++ b/tools/jack
@@ -22,7 +22,7 @@
#
# Settings
#
-JACK_VERSION=${JACK_VERSION:=4.20.BETA}
+JACK_VERSION=${JACK_VERSION:=4.21.BETA}
JACK_HOME="${JACK_HOME:=$HOME/.jack-server}"
JACK_CLIENT_SETTING="${JACK_CLIENT_SETTING:=$HOME/.jack-settings}"
TMPDIR=${TMPDIR:=/tmp}
diff --git a/tools/jack_versions.mk b/tools/jack_versions.mk
index 7f4c31c..0d9777f 100644
--- a/tools/jack_versions.mk
+++ b/tools/jack_versions.mk
@@ -18,10 +18,10 @@
jack_jar_tools := $(LOCAL_PATH)/jack-jar-tools.jar
jack_eng_jar := $(LOCAL_PATH)/jacks/jack.jar
-JACK_STABLE_VERSION := 4.20.BETA
-JACK_DOGFOOD_VERSION := 4.18.BETA
-JACK_SDKTOOL_VERSION := 4.20.BETA
-JACK_LANG_DEV_VERSION := 4.20.BETA
+JACK_STABLE_VERSION := 4.21.BETA
+JACK_DOGFOOD_VERSION := 4.21.BETA
+JACK_SDKTOOL_VERSION := 4.21.BETA
+JACK_LANG_DEV_VERSION := 4.21.BETA
ifneq ("$(wildcard $(jack_eng_jar))","")
JACK_ENGINEERING_VERSION := $(shell java -jar $(jack_jar_tools) --version-code jack $(jack_eng_jar))
endif
diff --git a/tools/jacks/jack-4.20.BETA.jar b/tools/jacks/jack-4.21.BETA.jar
similarity index 68%
rename from tools/jacks/jack-4.20.BETA.jar
rename to tools/jacks/jack-4.21.BETA.jar
index 060e237..4faa27a 100644
--- a/tools/jacks/jack-4.20.BETA.jar
+++ b/tools/jacks/jack-4.21.BETA.jar
Binary files differ
diff --git a/tools/jills/jill-4.20.BETA.jar b/tools/jills/jill-4.20.BETA.jar
deleted file mode 100644
index a2ae6c6..0000000
--- a/tools/jills/jill-4.20.BETA.jar
+++ /dev/null
Binary files differ
diff --git a/tools/jills/jill-4.21.BETA.jar b/tools/jills/jill-4.21.BETA.jar
new file mode 100644
index 0000000..f811aee
--- /dev/null
+++ b/tools/jills/jill-4.21.BETA.jar
Binary files differ