StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove REMOVE_OAHL_FROM_BCP flag

Browse Source 
The REMOVE_OAHL_FROM_BCP flag is always set to true and is no longer
necessary so this change removes any uses of the flag.

Bug: 18027885
Test: cts/tests/signature/runSignatureTest.sh
Change-Id: Ied8c3315b29094ad6acee539520af3e4c9e79839
This commit is contained in:
Paul Duffin
2019-01-08 13:29:41 +00:00
parent e8f1a420bc
commit fd24c9fe1f
2 changed files with 0 additions and 14 deletions
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 := \ HIDDENAPI_EXTRA_APP_USAGE_JARS := \
core-oj-hiddenapi \ 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 # Broken build defaults
# ############################################################### # ###############################################################

9
target/product/base_system.mk
View File

@@ -291,15 +291,6 @@ PRODUCT_UPDATABLE_BOOT_LOCATIONS := \
/apex/com.android.conscrypt/javalib/conscrypt.jar /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 += \ PRODUCT_COPY_FILES += \
system/core/rootdir/init.usb.rc:root/init.usb.rc \ system/core/rootdir/init.usb.rc:root/init.usb.rc \
system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \ system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \