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

Commit dfaf3843 authored by Kenny Root's avatar Kenny Root
Browse files

Track change to JSSE provider 

Change-Id: I130b137f8ba62a3cf1b915dcf6a0cf3dc25043eb
parent 3d660f2a

core/dex_preopt.mk

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
####################################



# TODO: replace it with device's BOOTCLASSPATH

DEXPREOPT_BOOT_JARS := core:okhttp:core-junit:bouncycastle:ext:framework:telephony-common:voip-common:mms-common:android.policy:services:apache-xml

DEXPREOPT_BOOT_JARS := core:conscrypt:okhttp:core-junit:bouncycastle:ext:framework:telephony-common:voip-common:mms-common:android.policy:services:apache-xml

DEXPREOPT_BOOT_JARS_MODULES := $(subst :, ,$(DEXPREOPT_BOOT_JARS))



DEXPREOPT_BUILD_DIR := $(OUT_DIR)

core/tasks/cts.mk

+2 −1
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ $(hide) java -Xmx256M \ 
endef



CORE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core,,COMMON)

CONSCRYPT_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,conscrypt,,COMMON)

BOUNCYCASTLE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,bouncycastle,,COMMON)

APACHEXML_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,apache-xml,,COMMON)

OKHTTP_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,okhttp,,COMMON)
@@ -88,7 +89,7 @@ SQLITEJDBC_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,sqlite-jd 
JUNIT_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core-junit,,COMMON)

CORETESTS_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core-tests,,COMMON)



GEN_CLASSPATH := $(CORE_INTERMEDIATES)/classes.jar:$(BOUNCYCASTLE_INTERMEDIATES)/classes.jar:$(APACHEXML_INTERMEDIATES)/classes.jar:$(OKHTTP_INTERMEDIATES)/classes.jar:$(JUNIT_INTERMEDIATES)/classes.jar:$(SQLITEJDBC_INTERMEDIATES)/javalib.jar:$(CORETESTS_INTERMEDIATES)/javalib.jar

GEN_CLASSPATH := $(CORE_INTERMEDIATES)/classes.jar:$(CONSCRYPT_INTERMEDIATES)/classes.jar:$(BOUNCYCASTLE_INTERMEDIATES)/classes.jar:$(APACHEXML_INTERMEDIATES)/classes.jar:$(OKHTTP_INTERMEDIATES)/classes.jar:$(JUNIT_INTERMEDIATES)/classes.jar:$(SQLITEJDBC_INTERMEDIATES)/javalib.jar:$(CORETESTS_INTERMEDIATES)/javalib.jar



CTS_CORE_XMLS := \

	$(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.dalvik.xml \

target/product/core.mk

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ ifeq ($(WITH_HOST_DALVIK),true) 
    PRODUCT_PACKAGES += \

        apache-xml-hostdex \

        bouncycastle-hostdex \

        conscrypt-hostdex \

        core-hostdex \

        okhttp-hostdex \

        libcrypto \

target/product/core_minimal.mk

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ PRODUCT_PACKAGES += \ 
    cacerts \

    com.android.location.provider \

    com.android.location.provider.xml \

    conscrypt \

    core \

    core-junit \

    dalvikvm \

target/product/mini.mk

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ PRODUCT_PACKAGES += \ 
    cacerts \

    com.android.location.provider \

    com.android.location.provider.xml \

    conscrypt \

    core \

    core-junit \

    dalvikvm \