diff options
| author | jwilson <jwilson@squareup.com> | 2013-03-30 09:00:01 -0400 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-04-02 16:24:04 -0700 |
| commit | 190dde0b1ab701c7eed6fab839439bc9b8c7a9ab (patch) | |
| tree | fa935980bfc420da244da7eca47e3b472d78994e | |
| parent | 0262d0f74725f8a165b20eeac323cdd8ca31df03 (diff) | |
| download | build-190dde0b1ab701c7eed6fab839439bc9b8c7a9ab.zip build-190dde0b1ab701c7eed6fab839439bc9b8c7a9ab.tar.gz build-190dde0b1ab701c7eed6fab839439bc9b8c7a9ab.tar.bz2 | |
Add OkHttp to the platform.
Change-Id: I18716683632249573295cb2eb5229a1188ed0f17
| -rw-r--r-- | core/dex_preopt.mk | 2 | ||||
| -rw-r--r-- | core/tasks/cts.mk | 5 | ||||
| -rw-r--r-- | target/product/core.mk | 2 | ||||
| -rw-r--r-- | target/product/mini.mk | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 4c51b10..8894572 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -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) diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 5b041d6..6e05b18 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -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,\ diff --git a/target/product/core.mk b/target/product/core.mk index bf05584..022c4f1 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -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 \ diff --git a/target/product/mini.mk b/target/product/mini.mk index 22762ab..a97cbcb 100644 --- a/target/product/mini.mk +++ b/target/product/mini.mk @@ -143,6 +143,7 @@ PRODUCT_PACKAGES += \ mdnsd \ mms-common \ network \ + okhttp \ pand \ requestsync \ screencap \ |