summaryrefslogtreecommitdiffstats
path: root/core/host_dalvik_static_java_library.mk
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2015-02-05 16:10:58 +0100
committerYohann Roussel <yroussel@google.com>2015-02-18 22:54:18 +0100
commitd2a76c14bf60f45a4bf19721a09a10f758c42a66 (patch)
treece76a61becd8d1050f6ad4c02350f703565cab5b /core/host_dalvik_static_java_library.mk
parent1f382fa4f79dad8be5a7c32ed2a14a65003e661b (diff)
downloadbuild-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_dalvik_static_java_library.mk')
-rw-r--r--core/host_dalvik_static_java_library.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/host_dalvik_static_java_library.mk b/core/host_dalvik_static_java_library.mk
index bdce583..410b251 100644
--- a/core/host_dalvik_static_java_library.mk
+++ b/core/host_dalvik_static_java_library.mk
@@ -21,6 +21,8 @@
#
ifeq ($(HOST_OS),linux)
+LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_IS_STATIC_JAVA_LIBRARY := true
USE_CORE_LIB_BOOTCLASSPATH := true
LOCAL_JAVA_LIBRARIES += core-libart-hostdex
@@ -51,5 +53,5 @@ $(full_classes_jack): $(java_sources) $(java_resource_sources) $(full_jack_lib_d
$(java-to-jack)
USE_CORE_LIB_BOOTCLASSPATH :=
-
+LOCAL_IS_STATIC_JAVA_LIBRARY :=
endif