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

Commit 5ec66d15 authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Add OkHttp to the platform."

parents 0262d0f7 190dde0b

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:core-junit:bouncycastle:ext:framework:telephony-common:mms-common:android.policy:services:apache-xml

DEXPREOPT_BOOT_JARS := core:okhttp:core-junit:bouncycastle:ext:framework:telephony-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

+3 −2
Original line number Diff line number Diff line
@@ -83,11 +83,12 @@ endef 
CORE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core,,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)

SQLITEJDBC_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,sqlite-jdbc,,COMMON)

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:$(JUNIT_INTERMEDIATES)/classes.jar:$(SQLITEJDBC_INTERMEDIATES)/javalib.jar:$(CORETESTS_INTERMEDIATES)/javalib.jar

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



CTS_CORE_XMLS := \

	$(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.dalvik.xml \
@@ -103,7 +104,7 @@ $(CTS_CORE_XMLS): PRIVATE_CLASSPATH:=$(GEN_CLASSPATH) 
# build system requires that dependencies use javalib.jar.  If

# javalib.jar is up-to-date, then classes.jar is as well.  Depending

# on classes.jar will build the files incorrectly.

$(CTS_CORE_XMLS): $(CTS_CORE_CASES) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar $(CORE_INTERMEDIATES)/javalib.jar $(BOUNCYCASTLE_INTERMEDIATES)/javalib.jar $(APACHEXML_INTERMEDIATES)/javalib.jar $(SQLITEJDBC_INTERMEDIATES)/javalib.jar $(JUNIT_INTERMEDIATES)/javalib.jar $(CORETESTS_INTERMEDIATES)/javalib.jar | $(ACP)

$(CTS_CORE_XMLS): $(CTS_CORE_CASES) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar $(CORE_INTERMEDIATES)/javalib.jar $(BOUNCYCASTLE_INTERMEDIATES)/javalib.jar $(APACHEXML_INTERMEDIATES)/javalib.jar $(OKHTTP_INTERMEDIATES)/javalib.jar $(SQLITEJDBC_INTERMEDIATES)/javalib.jar $(JUNIT_INTERMEDIATES)/javalib.jar $(CORETESTS_INTERMEDIATES)/javalib.jar | $(ACP)

	$(hide) mkdir -p $(CTS_TESTCASES_OUT)

	$(call generate-core-test-description,$(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.dalvik,\

		cts/tests/core/libcore/dalvik/AndroidManifest.xml,\

target/product/core.mk

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ PRODUCT_PACKAGES += \ 
    libz \

    make_ext4fs \

    mdnsd \

    okhttp \

    requestsync \

    screencap \

    sensorservice \
@@ -142,6 +143,7 @@ ifeq ($(WITH_HOST_DALVIK),true) 
        apache-xml-hostdex \

        bouncycastle-hostdex \

        core-hostdex \

        okhttp-hostdex \

        libcrypto \

        libexpat \

        libicui18n \

target/product/mini.mk

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

    mms-common \

    network \

    okhttp \

    pand \

    requestsync \

    screencap \