Import Jack and Jill Carnac 1.2-rc3
Jack version: 298500 fea776d029fb8ceb9dfa1e7c354e03ac4c3597de
Jill version: 298500 fea776d029fb8ceb9dfa1e7c354e03ac4c3597de
Bugs fixed since 1.2-rc2
Bug: 28736446
Bug: 28719539
Bug: 28610549
Bug: 28572715
Bug: 27097725
Change-Id: Ib1d6ef2b6484d43cedcf4b5caeceb18ad4ebc453
diff --git a/tools/jack b/tools/jack
index 095e67d..0764af4 100755
--- a/tools/jack
+++ b/tools/jack
@@ -22,7 +22,7 @@
#
# Settings
#
-JACK_VERSION=${JACK_VERSION:=3.34.CANDIDATE}
+JACK_VERSION=${JACK_VERSION:=3.35.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 3dcd68f..1bd9754 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 9931d08..7a8ebf4 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.34.CANDIDATE
+JACK_STABLE_VERSION := 3.35.CANDIDATE
JACK_DOGFOOD_VERSION := 4.1.PRE_ALPHA
-JACK_SDKTOOL_VERSION := 3.34.CANDIDATE
-JACK_LANG_DEV_VERSION := 3.34.CANDIDATE
+JACK_SDKTOOL_VERSION := 3.35.CANDIDATE
+JACK_LANG_DEV_VERSION := 3.35.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.34.CANDIDATE.jar b/tools/jacks/jack-3.35.CANDIDATE.jar
similarity index 90%
rename from tools/jacks/jack-3.34.CANDIDATE.jar
rename to tools/jacks/jack-3.35.CANDIDATE.jar
index f49f1cc..b5d71b1 100644
--- a/tools/jacks/jack-3.34.CANDIDATE.jar
+++ b/tools/jacks/jack-3.35.CANDIDATE.jar
Binary files differ
diff --git a/tools/jills/jill-3.34.CANDIDATE.jar b/tools/jills/jill-3.35.CANDIDATE.jar
similarity index 92%
rename from tools/jills/jill-3.34.CANDIDATE.jar
rename to tools/jills/jill-3.35.CANDIDATE.jar
index ab9ec81..8f54e3c 100644
--- a/tools/jills/jill-3.34.CANDIDATE.jar
+++ b/tools/jills/jill-3.35.CANDIDATE.jar
Binary files differ
