diff options
| author | Kenny Root <kroot@google.com> | 2013-04-30 04:02:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-30 04:02:20 +0000 |
| commit | b4314f15346b05eed956c979c7d05f4732caaae3 (patch) | |
| tree | 68fb806995be61fac1a83691dabae9c7e6232654 | |
| parent | 042723c0151980fee315678736751f7385977d90 (diff) | |
| parent | 13611990f693acbb41db67acbbfda5d67828a5fe (diff) | |
| download | build-b4314f15346b05eed956c979c7d05f4732caaae3.tar.gz | |
Merge "Track change to JSSE provider"
| -rw-r--r-- | core/dex_preopt.mk | 2 | ||||
| -rw-r--r-- | core/tasks/cts.mk | 3 | ||||
| -rw-r--r-- | target/product/core.mk | 2 | ||||
| -rw-r--r-- | target/product/mini.mk | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 88945727f0..00c0093216 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:okhttp:core-junit:bouncycastle:ext:framework:telephony-common:mms-common:android.policy:services:apache-xml +DEXPREOPT_BOOT_JARS := core:conscrypt: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 6e05b1876b..9154f32cf5 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -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 \ diff --git a/target/product/core.mk b/target/product/core.mk index 022c4f1491..aae2fec2a0 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -51,6 +51,7 @@ PRODUCT_PACKAGES += \ cacerts \ com.android.location.provider \ com.android.location.provider.xml \ + conscrypt \ core \ core-junit \ dalvikvm \ @@ -142,6 +143,7 @@ ifeq ($(WITH_HOST_DALVIK),true) PRODUCT_PACKAGES += \ apache-xml-hostdex \ bouncycastle-hostdex \ + conscrypt-hostdex \ core-hostdex \ okhttp-hostdex \ libcrypto \ diff --git a/target/product/mini.mk b/target/product/mini.mk index a97cbcbe96..da2fc31baf 100644 --- a/target/product/mini.mk +++ b/target/product/mini.mk @@ -71,6 +71,7 @@ PRODUCT_PACKAGES += \ cacerts \ com.android.location.provider \ com.android.location.provider.xml \ + conscrypt \ core \ core-junit \ dalvikvm \ |