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/static_java_library.mk | |
| parent | 1f382fa4f79dad8be5a7c32ed2a14a65003e661b (diff) | |
| download | build-d2a76c14bf60f45a4bf19721a09a10f758c42a66.zip build-d2a76c14bf60f45a4bf19721a09a10f758c42a66.tar.gz build-d2a76c14bf60f45a4bf19721a09a10f758c42a66.tar.bz2 | |
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/static_java_library.mk')
| -rw-r--r-- | core/static_java_library.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/static_java_library.mk b/core/static_java_library.mk index c5d1b46..9b7b46a 100644 --- a/core/static_java_library.mk +++ b/core/static_java_library.mk @@ -59,6 +59,10 @@ endif LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS) +################################# +include $(BUILD_SYSTEM)/configure_local_jack.mk +################################# + ifdef LOCAL_JACK_ENABLED ifndef LOCAL_JACK_PROGUARD_FLAGS LOCAL_JACK_PROGUARD_FLAGS := $(LOCAL_PROGUARD_FLAGS) |