commit bd613de7ff6a6d930a6b225b4834531adee20b0d
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Thu Feb 22 16:35:12 2018 +0000
committer Przemyslaw Szczepaniak <pszczepaniak@google.com> Thu Feb 22 16:38:49 2018 +0000
tree 0ef61666708af9f18edc501df25ac5e2fafc03dc
parent 929db472be0bf59ca9980e74a26e6a92832497a0

Remove org.apache.http.legacy from bootclasspath

Another attempt, waiting for b/73762903 to be mitigated

Change-Id: I496b1297f5dfe0737828ab01fc1b628f64a57304
Test: build, flash and cts/tests/signature/runSignatureTests.sh, manual
Bug: 18027885

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index d1124a1..f04fefb 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
 # ###############################################################