commit f1e7a45dc61cec37d636e6dbb0b3d1c60c24c0f3
author Yohann Roussel <yroussel@google.com> Mon Dec 12 17:14:59 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Dec 12 17:14:59 2016 +0000
tree cce87b18c790a27e2686055de39138a4bc82e043
parent f078c2031b515c58be93500bcefb23d491c64f4c
parent 72ddb3172205dab439d68e26a43d16742d868a6e

Merge "TEMPORARY HACK: Set a 10 minute timeout on jack-admin commands"
am: 72ddb31722

Change-Id: Icb4c3447ce7c789f4dc7ab54accaa7f83dc0045b

tools/jack_server_setup.mk

diff --git a/tools/jack_server_setup.mk b/tools/jack_server_setup.mk
index 780f890..8e42817 100644
--- a/tools/jack_server_setup.mk
+++ b/tools/jack_server_setup.mk
@@ -33,7 +33,16 @@
 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 600 $(LOCAL_PATH)/jack-admin
+else
 setup-jack-server : PRIVATE_JACK_ADMIN := $(LOCAL_PATH)/jack-admin
+endif
 setup-jack-server : PRIVATE_PATH := $(LOCAL_PATH)
 setup-jack-server : PRIVATE_SERVER_VERSION := $(jack_server_version)
 setup-jack-server : PRIVATE_SERVER_JAR := $(jack_server_jar)