Merge "Add the apache-http library to all product configs."
diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk
index dc8be5e..772245e 100644
--- a/core/host_dalvik_java_library.mk
+++ b/core/host_dalvik_java_library.mk
@@ -44,11 +44,7 @@
$(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
diff --git a/core/java.mk b/core/java.mk
index a2bd00b..5e9a285 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -262,17 +262,14 @@
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