tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Use Jack to check build""

Browse source
This commit is contained in:
Jean-Philippe Lesot 2015-01-21 13:52:48 +00:00 committed by Android (Google) Code Review
commit edacaa3a26
2 changed files with 2 additions and 9 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,11 +44,7 @@ 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

@ -262,17 +262,14 @@ 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 := $(full_classes_jack)
endif # !LOCAL_USE_JACK
java_alternative_checked_module :=
endif
# TODO: It looks like the only thing we need from base_rules is