summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-07-07 09:47:45 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-07-07 09:47:45 +0000
commitc2d941b862e53bf0050a7cc18670d9340d705ecf (patch)
tree9b8db1a44fac33487fdea4e04f426ee305dd6ea2
parent23626dcd09a810a9919edf028fe2b1fce1e86a67 (diff)
parentc6b3c6b48d9b5637c372b1be24444dcad894f134 (diff)
downloadsdk-android-o-preview-4.tar.gz
Merge "Use make variables to access java tools"android-o-preview-4
-rw-r--r--tools/jack_versions.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/jack_versions.mk b/tools/jack_versions.mk
index 4fd016da6..c6d67bd93 100644
--- a/tools/jack_versions.mk
+++ b/tools/jack_versions.mk
@@ -23,7 +23,7 @@ JACK_DOGFOOD_VERSION := 4.31.CANDIDATE
JACK_SDKTOOL_VERSION := 4.31.CANDIDATE
JACK_LANG_DEV_VERSION := 4.31.CANDIDATE
ifneq ("$(wildcard $(jack_eng_jar))","")
-JACK_ENGINEERING_VERSION := $(shell java -jar $(jack_jar_tools) --version-code jack $(jack_eng_jar))
+JACK_ENGINEERING_VERSION := $(shell $(JAVA) -jar $(jack_jar_tools) --version-code jack $(jack_eng_jar))
endif
ifneq ($(ANDROID_JACK_DEFAULT_VERSION),)