commit a5b2bad23254d4c93dd2de45d0b81842299a9ab9
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Fri Feb 23 14:05:59 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 23 14:05:59 2018 +0000
tree 0b53f4b1ede9b1bb5f632a991ac360fd2425eed6
parent 08dc62dd091453756e60a68bf41cb656e3b67d83
parent bd613de7ff6a6d930a6b225b4834531adee20b0d

Merge "Remove org.apache.http.legacy from bootclasspath"

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 53ec6d3..27f187d 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -202,6 +202,11 @@
 JAVA_TMPDIR_ARG :=
 endif
 
+# Default to remove the org.apache.http.legacy from bootclasspath
+ifeq ($(REMOVE_OAHL_FROM_BCP),)
+REMOVE_OAHL_FROM_BCP := true
+endif
+
 # ###############################################################
 # Include sub-configuration files
 # ###############################################################