commit b3b6348921a1e96a5d6e0d4894842006a71c0963
author Yohann Roussel <yroussel@google.com> Tue Jul 21 16:45:51 2015 +0000
committer Yohann Roussel <yroussel@google.com> Tue Jul 21 16:45:51 2015 +0000
tree 8d6d05aebc428f5231b899a495aa018485bfbfdd
parent 4c1fc77c2e8453082601ed8209aaaf5e433bb2f4

Revert "Clean call-jack and its callers"

This reverts commit 4c1fc77c2e8453082601ed8209aaaf5e433bb2f4.

Change-Id: I4f5e3ec1e6fea66f315a9411db17de257817dcc9

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index c30eef0..9c85e5b 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -752,6 +752,7 @@
 endif # TARGET_
 
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JACK_LIBRARIES := $(full_static_jack_libs)
+$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(LOCAL_JACK_VM_ARGS)
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_EXTRA_ARGS := $(LOCAL_JACK_EXTRA_ARGS)
 
 ifdef LOCAL_IS_HOST_MODULE