commit d2a76c14bf60f45a4bf19721a09a10f758c42a66
author Yohann Roussel <yroussel@google.com> Thu Feb 05 16:10:58 2015 +0100
committer Yohann Roussel <yroussel@google.com> Wed Feb 18 22:54:18 2015 +0100
tree ce76a61becd8d1050f6ad4c02350f703565cab5b
parent 1f382fa4f79dad8be5a7c32ed2a14a65003e661b

Change built module of static java libraries

Set LOCAL_BUILT_MODULE of static java libraries when Jack is enabled
to classes.jack instead of javalib.jar.
This allows that running mm in those libraries will build classes.jack
instead of the jar.

Change-Id: I96b4b227848e971df96331b3f0cc731e856be349

core/package_internal.mk

diff --git a/core/package_internal.mk b/core/package_internal.mk
index 3c488f6..40669a0 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -57,12 +57,9 @@
 endif
 LOCAL_MODULE_CLASS := APPS
 
-LOCAL_JACK_ENABLED := $(strip $(LOCAL_JACK_ENABLED))
-ifneq ($(LOCAL_JACK_ENABLED),full)
-ifneq ($(LOCAL_JACK_ENABLED),incremental)
-LOCAL_JACK_ENABLED :=
-endif
-endif
+#################################
+include $(BUILD_SYSTEM)/configure_local_jack.mk
+#################################
 
 # Package LOCAL_MODULE_TAGS default to optional
 LOCAL_MODULE_TAGS := $(strip $(LOCAL_MODULE_TAGS))