p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Track change to JSSE provider"

This commit is contained in:
Kenny Root 2013-04-30 04:02:20 +00:00 committed by Gerrit Code Review
parent 042723c015 13611990f6
commit b4314f1534
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/dex_preopt.mk
View File

@ -4,7 +4,7 @@
#################################### ####################################
# TODO: replace it with device's BOOTCLASSPATH # 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_BOOT_JARS_MODULES := $(subst :, ,$(DEXPREOPT_BOOT_JARS))
DEXPREOPT_BUILD_DIR := $(OUT_DIR) DEXPREOPT_BUILD_DIR := $(OUT_DIR)

3
core/tasks/cts.mk
View File

@ -81,6 +81,7 @@ $(hide) java -Xmx256M \
endef endef
CORE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core,,COMMON) 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) BOUNCYCASTLE_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,bouncycastle,,COMMON)
APACHEXML_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,apache-xml,,COMMON) APACHEXML_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,apache-xml,,COMMON)
OKHTTP_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,okhttp,,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) JUNIT_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core-junit,,COMMON)
CORETESTS_INTERMEDIATES :=$(call intermediates-dir-for,JAVA_LIBRARIES,core-tests,,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_CORE_XMLS := \
$(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.dalvik.xml \ $(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.dalvik.xml \

2
target/product/core.mk
View File

@ -51,6 +51,7 @@ PRODUCT_PACKAGES += \
cacerts \ cacerts \
com.android.location.provider \ com.android.location.provider \
com.android.location.provider.xml \ com.android.location.provider.xml \
conscrypt \
core \ core \
core-junit \ core-junit \
dalvikvm \ dalvikvm \
@ -142,6 +143,7 @@ ifeq ($(WITH_HOST_DALVIK),true)
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
apache-xml-hostdex \ apache-xml-hostdex \
bouncycastle-hostdex \ bouncycastle-hostdex \
conscrypt-hostdex \
core-hostdex \ core-hostdex \
okhttp-hostdex \ okhttp-hostdex \
libcrypto \ libcrypto \

1
target/product/mini.mk
View File

@ -71,6 +71,7 @@ PRODUCT_PACKAGES += \
cacerts \ cacerts \
com.android.location.provider \ com.android.location.provider \
com.android.location.provider.xml \ com.android.location.provider.xml \
conscrypt \
core \ core \
core-junit \ core-junit \
dalvikvm \ dalvikvm \