Merge "Revert "Use Jack to check build"" (edacaa3a) · Commits · e / os / android_build

core/host_dalvik_java_library.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -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

+2 −5

Original line number	Diff line number	Diff line
		@@ -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