diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-02-05 16:10:58 +0100 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2015-02-18 22:54:18 +0100 |
| commit | d2a76c14bf60f45a4bf19721a09a10f758c42a66 (patch) | |
| tree | ce76a61becd8d1050f6ad4c02350f703565cab5b /core/package_internal.mk | |
| parent | 1f382fa4f79dad8be5a7c32ed2a14a65003e661b (diff) | |
| download | build-d2a76c14bf60f45a4bf19721a09a10f758c42a66.tar.gz build-d2a76c14bf60f45a4bf19721a09a10f758c42a66.tar.bz2 build-d2a76c14bf60f45a4bf19721a09a10f758c42a66.zip | |
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
Diffstat (limited to 'core/package_internal.mk')
| -rw-r--r-- | core/package_internal.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk index 3c488f63b..40669a0b3 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -57,12 +57,9 @@ $(error $(LOCAL_PATH): Package modules may not set LOCAL_MODULE_CLASS) 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)) |