openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Use Jack to check build"

This commit is contained in:
Yohann Roussel 2015-01-15 17:58:35 +00:00 committed by Android (Google) Code Review
parent b515f27d6b 8bc90fd2d6
commit 8b5ff260d9
2 changed files with 9 additions and 2 deletions
Show Stats 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)
# 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

7
core/java.mk
View File

@ -268,14 +268,17 @@ LOCAL_INTERMEDIATE_TARGETS += $(RenderScript_file_stamp)
LOCAL_RESOURCE_DIR := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/renderscript/res $(LOCAL_RESOURCE_DIR)
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
# 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
# command line.
ifdef full_classes_jar
java_alternative_checked_module := $(full_classes_compiled_jar)
else
java_alternative_checked_module :=
java_alternative_checked_module := $(full_classes_jack)
endif # !LOCAL_USE_JACK
endif
# TODO: It looks like the only thing we need from base_rules is