summaryrefslogtreecommitdiffstats
path: root/core/host_dalvik_java_library.mk
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2015-01-13 17:07:04 +0100
committerYohann Roussel <yroussel@google.com>2015-01-15 11:23:38 +0100
commit8bc90fd2d6ccf70b65d2d3aad22b0453b86a262d (patch)
tree260fdb762809fb301fb8e7efd029ca1e3a965142 /core/host_dalvik_java_library.mk
parent138768c1bbb49d549c4b14281fa5f0bffac7d933 (diff)
downloadbuild-8bc90fd2d6ccf70b65d2d3aad22b0453b86a262d.zip
build-8bc90fd2d6ccf70b65d2d3aad22b0453b86a262d.tar.gz
build-8bc90fd2d6ccf70b65d2d3aad22b0453b86a262d.tar.bz2
Use Jack to check build
Of modules that are to be compiled with Jack. Change-Id: Ie8bd00f67f09c0e5ed8fe650f5131a3dfc29e277
Diffstat (limited to 'core/host_dalvik_java_library.mk')
-rw-r--r--core/host_dalvik_java_library.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk
index 772245e..dc8be5e 100644
--- a/core/host_dalvik_java_library.mk
+++ b/core/host_dalvik_java_library.mk
@@ -44,7 +44,11 @@ LOCAL_INTERMEDIATE_TARGETS += \
$(built_dex)
# See comment in java.mk
+ifeq ($(strip $(LOCAL_USE_JACK)),true)
+java_alternative_checked_module := $(full_classes_jack)
+else
java_alternative_checked_module := $(full_classes_compiled_jar)
+endif
#######################################
include $(BUILD_SYSTEM)/base_rules.mk