Merge "Update api to reflect changes in doclava"
diff --git a/Android.mk b/Android.mk
index 9d9f2fe..7e44e83 100644
--- a/Android.mk
+++ b/Android.mk
@@ -69,6 +69,7 @@
LOCAL_SRC_FILES := $(apache_http_src_files)
LOCAL_SDK_VERSION := 21
LOCAL_MODULE_TAGS := optional
+ifeq ($(REMOVE_OAHL_FROM_BCP),true)
# Previously, this JAR was included on the bootclasspath so was compiled using
# the speed-profile. ensures that it continues to be compiled using the
# speed-profile in order to avoid regressing the performance, particularly of
@@ -76,6 +77,7 @@
# interpreter + JIT) and so would be slower.
LOCAL_DEX_PREOPT_GENERATE_PROFILE := true
LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING := $(LOCAL_PATH)/art-profile/$(LOCAL_MODULE).prof.txt
+endif
include $(BUILD_JAVA_LIBRARY)
##############################################