Merge "Remove Rasterizer and its subclasses from the public API."
diff --git a/tools/jack b/tools/jack
index 74d2b47..83a70af 100755
--- a/tools/jack
+++ b/tools/jack
@@ -22,7 +22,7 @@
#
# Settings
#
-JACK_VERSION=${JACK_VERSION:=4.17.BETA}
+JACK_VERSION=${JACK_VERSION:=4.19.BETA}
JACK_HOME="${JACK_HOME:=$HOME/.jack-server}"
JACK_CLIENT_SETTING="${JACK_CLIENT_SETTING:=$HOME/.jack-settings}"
TMPDIR=${TMPDIR:=/tmp}
diff --git a/tools/jack_server_setup.mk b/tools/jack_server_setup.mk
index 5aa11ed..8e42817 100644
--- a/tools/jack_server_setup.mk
+++ b/tools/jack_server_setup.mk
@@ -33,9 +33,13 @@
endif
.PHONY: setup-jack-server
+ifeq ($(HOST_OS),darwin)
+ALARM :=
+else
ALARM := $(shell which alarm)
+endif
ifneq (,$(ALARM))
-setup-jack-server : PRIVATE_JACK_ADMIN := $(ALARM) -l 300 $(LOCAL_PATH)/jack-admin
+setup-jack-server : PRIVATE_JACK_ADMIN := $(ALARM) -l 600 $(LOCAL_PATH)/jack-admin
else
setup-jack-server : PRIVATE_JACK_ADMIN := $(LOCAL_PATH)/jack-admin
endif
diff --git a/tools/jack_versions.mk b/tools/jack_versions.mk
index 47926ef..c6892de 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.17.BETA
+JACK_STABLE_VERSION := 4.19.BETA
JACK_DOGFOOD_VERSION := 4.18.BETA
-JACK_SDKTOOL_VERSION := 4.17.BETA
-JACK_LANG_DEV_VERSION := 4.17.BETA
+JACK_SDKTOOL_VERSION := 4.19.BETA
+JACK_LANG_DEV_VERSION := 4.19.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.17.BETA.jar b/tools/jacks/jack-4.19.BETA.jar
similarity index 91%
rename from tools/jacks/jack-4.17.BETA.jar
rename to tools/jacks/jack-4.19.BETA.jar
index 4dd77a7..9ee97db 100644
--- a/tools/jacks/jack-4.17.BETA.jar
+++ b/tools/jacks/jack-4.19.BETA.jar
Binary files differ
diff --git a/tools/jills/jill-4.17.BETA.jar b/tools/jills/jill-4.19.BETA.jar
similarity index 93%
rename from tools/jills/jill-4.17.BETA.jar
rename to tools/jills/jill-4.19.BETA.jar
index 5e12b93..1659b07 100644
--- a/tools/jills/jill-4.17.BETA.jar
+++ b/tools/jills/jill-4.19.BETA.jar
Binary files differ