StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Jack to check build

Browse Source 
Of modules that are to be compiled with Jack.

Change-Id: Ie8bd00f67f09c0e5ed8fe650f5131a3dfc29e277
This commit is contained in:
Yohann Roussel
2015-01-13 17:07:04 +01:00
parent 138768c1bb
commit 8bc90fd2d6
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/host_dalvik_java_library.mk
View File

@@ -44,7 +44,11 @@ LOCAL_INTERMEDIATE_TARGETS += \
$(built_dex) $(built_dex)
# See comment in java.mk # 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) java_alternative_checked_module := $(full_classes_compiled_jar)
endif
####################################### #######################################
include $(BUILD_SYSTEM)/base_rules.mk include $(BUILD_SYSTEM)/base_rules.mk

7
core/java.mk
View File

@@ -256,14 +256,17 @@ LOCAL_INTERMEDIATE_TARGETS += $(RenderScript_file_stamp)
LOCAL_RESOURCE_DIR := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/renderscript/res $(LOCAL_RESOURCE_DIR) LOCAL_RESOURCE_DIR := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/renderscript/res $(LOCAL_RESOURCE_DIR)
endif endif
java_alternative_checked_module :=
ifdef full_classes_jar
ifneq ($(strip $(LOCAL_USE_JACK)),true)
# All of the rules after full_classes_compiled_jar are very unlikely # All of the rules after full_classes_compiled_jar are very unlikely
# to fail except for bugs in their respective tools. If you would # to fail except for bugs in their respective tools. If you would
# like to run these rules, add the "all" modifier goal to the make # like to run these rules, add the "all" modifier goal to the make
# command line. # command line.
ifdef full_classes_jar
java_alternative_checked_module := $(full_classes_compiled_jar) java_alternative_checked_module := $(full_classes_compiled_jar)
else else
java_alternative_checked_module := java_alternative_checked_module := $(full_classes_jack)
endif # !LOCAL_USE_JACK
endif endif
# TODO: It looks like the only thing we need from base_rules is # TODO: It looks like the only thing we need from base_rules is