p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Remove REMOVE_OAHL_FROM_BCP flag" am: 22efcc114e 

am: 5941366ce2

Change-Id: I1078642bd545e387b9e43184ca8f03a1b685d70f
This commit is contained in:
Paul Duffin 2019-01-24 08:17:09 -08:00 committed by android-build-merger
parent 9828c28666 5941366ce2
commit 7d2a8a5668
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/config.mk
View File

@ -212,11 +212,6 @@ endif
HIDDENAPI_EXTRA_APP_USAGE_JARS := \
core-oj-hiddenapi \
# Default to remove the org.apache.http.legacy from bootclasspath
ifeq ($(REMOVE_OAHL_FROM_BCP),)
REMOVE_OAHL_FROM_BCP := true
endif
# ###############################################################
# Broken build defaults
# ###############################################################

9
target/product/base_system.mk
View File

@ -290,15 +290,6 @@ PRODUCT_UPDATABLE_BOOT_LOCATIONS := \
/apex/com.android.conscrypt/javalib/conscrypt.jar
# Add the compatibility library that is needed when org.apache.http.legacy
# is removed from the bootclasspath.
ifeq ($(REMOVE_OAHL_FROM_BCP),true)
PRODUCT_PACKAGES += framework-oahl-backward-compatibility
PRODUCT_BOOT_JARS += framework-oahl-backward-compatibility
else
PRODUCT_BOOT_JARS += org.apache.http.legacy
endif
PRODUCT_COPY_FILES += \
system/core/rootdir/init.usb.rc:root/init.usb.rc \
system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \