commit 0851df8c82d61ec6abab757b1102eb2a6e98ea37
author Colin Cross <ccross@android.com> Fri Jun 30 13:55:38 2017 -0700
committer Colin Cross <ccross@android.com> Sat Jul 01 01:03:14 2017 +0000
tree 1cdfc04c3c78d30b9d349d4d234196837c9c8a94
parent b519d002f35104489e56f6e83ae87e7b81e95c4d

Provide make variables for java binaries

Replace java -> $(JAVA), etc. to prepare for moving java binaries
out of the path and using full paths to them.

Test: builds
Bug: 62956999
Change-Id: I5dfcd0d4e855ecde69cd127169e9545e59723d12

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 9aae8ca..8dbd5ed 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1093,7 +1093,7 @@
 	@echo "DumpPublicKey: $@ <= $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys)"
 	@rm -rf $@
 	@mkdir -p $(dir $@)
-	java -jar $(DUMPKEY_JAR) $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys) > $@
+	$(JAVA) -jar $(DUMPKEY_JAR) $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys) > $@
 
 RECOVERYIMAGE_ID_FILE := $(PRODUCT_OUT)/recovery.id