diff options
| author | Kenny Root <kroot@google.com> | 2013-04-29 13:25:29 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-04-29 15:58:54 -0700 |
| commit | dfaf384309d523a30bedcb9fe6da1074bafbe990 (patch) | |
| tree | 720002c18e0f1afe4f64e6d989d9b88f03af44e2 | |
| parent | 3d660f2a7c8a69a33825cb05ffe8667c99138000 (diff) | |
| download | build-dfaf384309d523a30bedcb9fe6da1074bafbe990.zip build-dfaf384309d523a30bedcb9fe6da1074bafbe990.tar.gz build-dfaf384309d523a30bedcb9fe6da1074bafbe990.tar.bz2 | |
Track change to JSSE provider
Change-Id: I130b137f8ba62a3cf1b915dcf6a0cf3dc25043eb
| -rw-r--r-- | core/dex_preopt.mk | 2 | ||||
| -rw-r--r-- | core/tasks/cts.mk | 3 | ||||
| -rw-r--r-- | target/product/core.mk | 1 | ||||
| -rw-r--r-- | target/product/core_minimal.mk | 1 | ||||
| -rw-r--r-- | target/product/mini.mk | 1 |
5 files changed, 6 insertions, 2 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 2d26b33..0c9904a 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: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) diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 6e05b18..9154f32 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 c0ab6e0..5285ba8 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -82,6 +82,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/core_minimal.mk b/target/product/core_minimal.mk index 96a8592..4f4623c 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -38,6 +38,7 @@ PRODUCT_PACKAGES += \ cacerts \ com.android.location.provider \ com.android.location.provider.xml \ + conscrypt \ core \ core-junit \ dalvikvm \ diff --git a/target/product/mini.mk b/target/product/mini.mk index 16a2b8f..a1f6317 100644 --- a/target/product/mini.mk +++ b/target/product/mini.mk @@ -72,6 +72,7 @@ PRODUCT_PACKAGES += \ cacerts \ com.android.location.provider \ com.android.location.provider.xml \ + conscrypt \ core \ core-junit \ dalvikvm \ |