commit 5863a7cf6375cedc790d561b8ce897fd8005522c
author Yohann Roussel <yroussel@google.com> Sat Jul 04 12:11:09 2015 +0000
committer Yohann Roussel <yroussel@google.com> Sat Jul 04 12:11:09 2015 +0000
tree e5206875fa8a6d44b6555ce4b4ce1a65564393f3
parent 5e50b342218fe2b9c1af20fd7da3c173bfac0499

Revert "Clean call-jack and its callers"

This reverts commit 5e50b342218fe2b9c1af20fd7da3c173bfac0499.

Change-Id: Ibf76cc454994c7ad84128ac923d39794d46a04ec

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index ee0b3a5..57bb4d0 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -108,6 +108,7 @@
 LOCAL_ALLOW_UNDEFINED_SYMBOLS:=
 LOCAL_DX_FLAGS:=
 LOCAL_JACK_ENABLED:=$(DEFAULT_JACK_ENABLED) # '' (ie disabled), disabled, full, incremental
+LOCAL_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS)
 LOCAL_JACK_EXTRA_ARGS := $(DEFAULT_JACK_EXTRA_ARGS)
 LOCAL_JACK_FLAGS:=
 LOCAL_JILL_FLAGS:=