Merge "Import Jack and Jill Douarn 1.3-b15 as Stable"
am: 5a3fb17474
Change-Id: Ib5da55a2d084afdb1a4fda1b3ce6bc8915ba2447
diff --git a/tools/jack b/tools/jack
index c52ae00..e89d554 100755
--- a/tools/jack
+++ b/tools/jack
@@ -22,7 +22,7 @@
#
# Settings
#
-JACK_VERSION=${JACK_VERSION:=4.19.BETA}
+JACK_VERSION=${JACK_VERSION:=4.20.BETA}
JACK_HOME="${JACK_HOME:=$HOME/.jack-server}"
JACK_CLIENT_SETTING="${JACK_CLIENT_SETTING:=$HOME/.jack-settings}"
TMPDIR=${TMPDIR:=/tmp}
@@ -206,4 +206,4 @@
fi
}
-sendRequest "" $@
\ No newline at end of file
+sendRequest "" $@
diff --git a/tools/jack_versions.mk b/tools/jack_versions.mk
index c6892de..7f4c31c 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.19.BETA
+JACK_STABLE_VERSION := 4.20.BETA
JACK_DOGFOOD_VERSION := 4.18.BETA
-JACK_SDKTOOL_VERSION := 4.19.BETA
-JACK_LANG_DEV_VERSION := 4.19.BETA
+JACK_SDKTOOL_VERSION := 4.20.BETA
+JACK_LANG_DEV_VERSION := 4.20.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.19.BETA.jar b/tools/jacks/jack-4.20.BETA.jar
similarity index 90%
rename from tools/jacks/jack-4.19.BETA.jar
rename to tools/jacks/jack-4.20.BETA.jar
index 9ee97db..060e237 100644
--- a/tools/jacks/jack-4.19.BETA.jar
+++ b/tools/jacks/jack-4.20.BETA.jar
Binary files differ
diff --git a/tools/jills/jill-4.19.BETA.jar b/tools/jills/jill-4.20.BETA.jar
similarity index 92%
rename from tools/jills/jill-4.19.BETA.jar
rename to tools/jills/jill-4.20.BETA.jar
index 1659b07..a2ae6c6 100644
--- a/tools/jills/jill-4.19.BETA.jar
+++ b/tools/jills/jill-4.20.BETA.jar
Binary files differ