Merge "Set Jack and Jill Douarn 1.3-b7 as Stable" am: f8b8fa30b9 am: 82242a834d
am: 468b089452
Change-Id: Ic2c2651d961a9c81c7f73d5e64847f22660959c0
diff --git a/tools/jack b/tools/jack
index 758de2b..3895d6a 100755
--- a/tools/jack
+++ b/tools/jack
@@ -22,7 +22,7 @@
#
# Settings
#
-JACK_VERSION=${JACK_VERSION:=4.10.BETA}
+JACK_VERSION=${JACK_VERSION:=4.12.BETA}
JACK_HOME="${JACK_HOME:=$HOME/.jack-server}"
CLIENT_SETTING="${CLIENT_SETTING:=$HOME/.jack-settings}"
TMPDIR=${TMPDIR:=/tmp}
diff --git a/tools/jack_versions.mk b/tools/jack_versions.mk
index f3ed281..393e2da 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.10.BETA
+JACK_STABLE_VERSION := 4.12.BETA
JACK_DOGFOOD_VERSION := 4.12.BETA
-JACK_SDKTOOL_VERSION := 4.10.BETA
-JACK_LANG_DEV_VERSION := 4.10.BETA
+JACK_SDKTOOL_VERSION := 4.12.BETA
+JACK_LANG_DEV_VERSION := 4.12.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.10.BETA.jar b/tools/jacks/jack-4.10.BETA.jar
deleted file mode 100644
index a13daa9..0000000
--- a/tools/jacks/jack-4.10.BETA.jar
+++ /dev/null
Binary files differ
diff --git a/tools/jills/jill-4.10.BETA.jar b/tools/jills/jill-4.10.BETA.jar
deleted file mode 100644
index 126b565..0000000
--- a/tools/jills/jill-4.10.BETA.jar
+++ /dev/null
Binary files differ