diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-04-03 14:19:26 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-04-03 14:19:26 -0700 |
| commit | 712676772b0d6e32bdce3430eed0a4d9771aac7e (patch) | |
| tree | 2782086c81b38d7cb29f49c130bbead8e0c8bb8f | |
| parent | fe15b4dad3538fbcbdea3a09243a5f25d3718b3e (diff) | |
| parent | 5ec66d15428e595934c9f0d9e26ea2234d545dbd (diff) | |
| download | build-712676772b0d6e32bdce3430eed0a4d9771aac7e.zip build-712676772b0d6e32bdce3430eed0a4d9771aac7e.tar.gz build-712676772b0d6e32bdce3430eed0a4d9771aac7e.tar.bz2 | |
resolved conflicts for merge of 5ec66d15 to jb-mr2-dev-plus-aosp
Change-Id: I0ef1665600f78527d0a98c7b36c4c2ef1a8182e3
| -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 82dd153..2d26b33 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:voip-common:mms-common:android.policy:services:apache-xml +DEXPREOPT_BOOT_JARS := core: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) 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 0e7aad6..c0ab6e0 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -72,6 +72,7 @@ PRODUCT_PACKAGES += \ libwebrtc_audio_preprocessing \ mdnsd \ mms-common \ + okhttp \ requestsync \ telephony-common \ voip-common @@ -82,6 +83,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 751b481..16a2b8f 100644 --- a/target/product/mini.mk +++ b/target/product/mini.mk @@ -144,6 +144,7 @@ PRODUCT_PACKAGES += \ libz \ mdnsd \ network \ + okhttp \ pand \ requestsync \ screencap \ |