Merge "Rename to cc_prebuilts_library_shared"
diff --git a/tools/jack b/tools/jack
index acc0bc4..8723eff 100755
--- a/tools/jack
+++ b/tools/jack
@@ -22,7 +22,7 @@
#
# Settings
#
-JACK_VERSION=${JACK_VERSION:=4.28.CANDIDATE}
+JACK_VERSION=${JACK_VERSION:=4.30.CANDIDATE}
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 4f5904a..9e409e3 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.28.CANDIDATE
-JACK_DOGFOOD_VERSION := 4.28.CANDIDATE
-JACK_SDKTOOL_VERSION := 4.28.CANDIDATE
-JACK_LANG_DEV_VERSION := 4.28.CANDIDATE
+JACK_STABLE_VERSION := 4.30.CANDIDATE
+JACK_DOGFOOD_VERSION := 4.29.CANDIDATE
+JACK_SDKTOOL_VERSION := 4.30.CANDIDATE
+JACK_LANG_DEV_VERSION := 4.30.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-4.28.CANDIDATE.jar b/tools/jacks/jack-4.29.CANDIDATE.jar
similarity index 91%
rename from tools/jacks/jack-4.28.CANDIDATE.jar
rename to tools/jacks/jack-4.29.CANDIDATE.jar
index 8ff6212..373b476 100644
--- a/tools/jacks/jack-4.28.CANDIDATE.jar
+++ b/tools/jacks/jack-4.29.CANDIDATE.jar
Binary files differ
diff --git a/tools/jacks/jack-4.28.CANDIDATE.jar b/tools/jacks/jack-4.30.CANDIDATE.jar
similarity index 84%
copy from tools/jacks/jack-4.28.CANDIDATE.jar
copy to tools/jacks/jack-4.30.CANDIDATE.jar
index 8ff6212..a5a3c32 100644
--- a/tools/jacks/jack-4.28.CANDIDATE.jar
+++ b/tools/jacks/jack-4.30.CANDIDATE.jar
Binary files differ
diff --git a/tools/jills/jill-4.28.CANDIDATE.jar b/tools/jills/jill-4.29.CANDIDATE.jar
similarity index 91%
rename from tools/jills/jill-4.28.CANDIDATE.jar
rename to tools/jills/jill-4.29.CANDIDATE.jar
index 18ea3c2..afadbd6 100644
--- a/tools/jills/jill-4.28.CANDIDATE.jar
+++ b/tools/jills/jill-4.29.CANDIDATE.jar
Binary files differ
diff --git a/tools/jills/jill-4.28.CANDIDATE.jar b/tools/jills/jill-4.30.CANDIDATE.jar
similarity index 89%
copy from tools/jills/jill-4.28.CANDIDATE.jar
copy to tools/jills/jill-4.30.CANDIDATE.jar
index 18ea3c2..e1cdf88 100644
--- a/tools/jills/jill-4.28.CANDIDATE.jar
+++ b/tools/jills/jill-4.30.CANDIDATE.jar
Binary files differ
