Merge "Import Jack and Jill Carnac 1.2-rc4" am: 7d12afa6f6
am: 93453502ea
* commit '93453502ea2cea16322b96ef5aa1e33ef81fbced':
Import Jack and Jill Carnac 1.2-rc4
Change-Id: I6b141236c2c852efc2d3a2d306c041eabbbd3942
diff --git a/tools/jack b/tools/jack
index 0764af4..ae291f4 100755
--- a/tools/jack
+++ b/tools/jack
@@ -22,7 +22,7 @@
#
# Settings
#
-JACK_VERSION=${JACK_VERSION:=3.35.CANDIDATE}
+JACK_VERSION=${JACK_VERSION:=3.36.CANDIDATE}
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 1bd9754..f21ea8c 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 7a8ebf4..e81c45e 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 := 3.35.CANDIDATE
+JACK_STABLE_VERSION := 3.36.CANDIDATE
JACK_DOGFOOD_VERSION := 4.1.PRE_ALPHA
-JACK_SDKTOOL_VERSION := 3.35.CANDIDATE
-JACK_LANG_DEV_VERSION := 3.35.CANDIDATE
+JACK_SDKTOOL_VERSION := 3.36.CANDIDATE
+JACK_LANG_DEV_VERSION := 3.36.CANDIDATE
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-3.35.CANDIDATE.jar b/tools/jacks/jack-3.36.CANDIDATE.jar
similarity index 91%
rename from tools/jacks/jack-3.35.CANDIDATE.jar
rename to tools/jacks/jack-3.36.CANDIDATE.jar
index b5d71b1..e66b905 100644
--- a/tools/jacks/jack-3.35.CANDIDATE.jar
+++ b/tools/jacks/jack-3.36.CANDIDATE.jar
Binary files differ
diff --git a/tools/jills/jill-3.35.CANDIDATE.jar b/tools/jills/jill-3.36.CANDIDATE.jar
similarity index 93%
rename from tools/jills/jill-3.35.CANDIDATE.jar
rename to tools/jills/jill-3.36.CANDIDATE.jar
index 8f54e3c..8bad10a 100644
--- a/tools/jills/jill-3.35.CANDIDATE.jar
+++ b/tools/jills/jill-3.36.CANDIDATE.jar
Binary files differ