commit 7521ca7f1516e2a426912634215a17e176004a47
author Yohann Roussel <yroussel@google.com> Mon Aug 01 14:53:39 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 01 14:53:39 2016 +0000
tree 8329d765bd53b952ff66062ed2cc8045003b1b05
parent d5f015ca94c5333dd910ad91327f2cb726f85db9
parent 22525e958356ed00215770de133349b3ad12eead

Merge \"Install jack engineering if available\"
am: 22525e9583

Change-Id: Ie6e8c17110581a3b5a24751eceb3b1620decbb12

tools/jack_server_setup.mk

diff --git a/tools/jack_server_setup.mk b/tools/jack_server_setup.mk
index fd6a134..cfce228 100644
--- a/tools/jack_server_setup.mk
+++ b/tools/jack_server_setup.mk
@@ -54,4 +54,7 @@
 endif
 	$(hide) $(PRIVATE_JACK_ADMIN) update server $(PRIVATE_SERVER_JAR) $(PRIVATE_SERVER_VERSION) 2>&1 || exit 0
 	$(hide) $(foreach jack_jar,$(available_jack_jars),$(PRIVATE_JACK_ADMIN) update jack $(jack_jar) $(patsubst $(PRIVATE_PATH)/jacks/jack-%.jar,%,$(jack_jar)) || exit 47;)
+ifdef JACK_ENGINEERING_VERSION
+	$(hide) $(PRIVATE_JACK_ADMIN) update jack $(jack_eng_jar)
+endif
 endif