Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a4f2ed7 authored Jul 14, 2017 by Paul Duffin

Conditionally remove oahl from bootclasspath

If REMOVE_OAHL_FROM_BCP=true then this adds the
framework-oahl-backward-compatibility library to the bootclasspath.

Otherwise, it adds the org.apache.http.legacy instead.

Bug: 18027885
Bug: 72375096
Test: build, flash and test manually and with FrameworkCoreTests
Change-Id: I17170f873eec93b2e2ed7be3459e2d28c96bbe4c

parent f97f420e

target/product/core_minimal.mk

+6 −1

Original line number	Diff line number	Diff line
		@@ -116,10 +116,15 @@ PRODUCT_BOOT_JARS := \
		telephony-common \
		voip-common \
		ims-common \
		org.apache.http.legacy.boot \
		android.hidl.base-V1.0-java \
		android.hidl.manager-V1.0-java

		ifeq ($(REMOVE_OAHL_FROM_BCP),true)
		PRODUCT_BOOT_JARS += framework-oahl-backward-compatibility
		else
		PRODUCT_BOOT_JARS += org.apache.http.legacy.boot
		endif

		# The order of PRODUCT_SYSTEM_SERVER_JARS matters.
		PRODUCT_SYSTEM_SERVER_JARS := \
		services \

target/product/core_tiny.mk

+6 −1

Original line number	Diff line number	Diff line
		@@ -100,10 +100,15 @@ PRODUCT_BOOT_JARS := \
		telephony-common \
		voip-common \
		ims-common \
		org.apache.http.legacy.boot \
		android.hidl.base-V1.0-java \
		android.hidl.manager-V1.0-java

		ifeq ($(REMOVE_OAHL_FROM_BCP),true)
		PRODUCT_BOOT_JARS += framework-oahl-backward-compatibility
		else
		PRODUCT_BOOT_JARS += org.apache.http.legacy.boot
		endif

		# The order of PRODUCT_SYSTEM_SERVER_JARS matters.
		PRODUCT_SYSTEM_SERVER_JARS := \
		services \