commit 16243bdbec94c03c38db92cffe2e2d69f84cf79b
author Yohann Roussel <yroussel@google.com> Mon Sep 19 17:49:03 2016 +0200
committer Sebastien Hertz <shertz@google.com> Wed Sep 21 10:54:42 2016 +0200
tree 10fb93e3580aa022752a8f8ce6d30a819192831b
parent 53b7fbbe78b6218962cc439c568533dd2c4e31c2

Fix bad JACK_PLUGIN variable

Changed to LOCAL_JACK_PLUGIN.

(cherry picked from commit 17924b136cb5bfc60d138e8c7e5c18a90b5965c3)

Test: Manually tested by some manual activations of the coverage plugin.
Change-Id: I1be4aaa502103fc308d35a5672dc4fe5900c4ebe

core/prebuilt_internal.mk

diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk
index 4095ab7..c31a07e 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -481,7 +481,7 @@
 $(intermediates.COMMON)/classes.jack : PRIVATE_JACK_FLAGS:=$(LOCAL_JACK_FLAGS)
 $(intermediates.COMMON)/classes.jack : PRIVATE_JACK_MIN_SDK_VERSION := $(if $(strip $(LOCAL_MIN_SDK_VERSION)),$(LOCAL_MIN_SDK_VERSION),1)
 $(intermediates.COMMON)/classes.jack : PRIVATE_JACK_PLUGIN_PATH := $(LOCAL_JACK_PLUGIN_PATH)
-$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_PLUGIN := $(JACK_PLUGIN)
+$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_PLUGIN := $(LOCAL_JACK_PLUGIN)
 $(intermediates.COMMON)/classes.jack : $(LOCAL_JACK_PLUGIN_PATH) $(my_src_jar) \
         $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK_DEFAULT_ARGS) $(JACK) \
         | setup-jack-server