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/host_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/host_java_library.mk')
| -rw-r--r-- | core/host_java_library.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/host_java_library.mk b/core/host_java_library.mk index b751c5f..513d185 100644 --- a/core/host_java_library.mk +++ b/core/host_java_library.mk @@ -58,13 +58,13 @@ endif $(full_classes_emma_jar) : $(full_classes_compiled_jar) | $(EMMA_JAR) $(transform-classes.jar-to-emma) -$(LOCAL_BUILT_MODULE) : $(full_classes_emma_jar) +$(built_javalib_jar) : $(full_classes_emma_jar) @echo Copying: $@ $(hide) $(ACP) -fp $< $@ else # LOCAL_EMMA_INSTRUMENT -# Directly build into LOCAL_BUILT_MODULE. -full_classes_compiled_jar := $(LOCAL_BUILT_MODULE) +# Directly build into $(built_javalib_jar). +full_classes_compiled_jar := $(built_javalib_jar) endif # LOCAL_EMMA_INSTRUMENT $(full_classes_compiled_jar): PRIVATE_JAVAC_DEBUG_FLAGS := -g |