am d14586e3: resolved conflicts for merge of a69af5af
to jb-mr2-dev-plus-aosp
* commit 'd14586e35a3df39cc3aa6aff6a54463270a5e1a7': Track change to JSSE provider
This commit is contained in:
commit
152a432151
|
@ -37,7 +37,7 @@ loglevel 3
|
|||
export ANDROID_STORAGE /storage
|
||||
export ASEC_MOUNTPOINT /mnt/asec
|
||||
export LOOP_MOUNTPOINT /mnt/obb
|
||||
export BOOTCLASSPATH /system/framework/core.jar:/system/framework/okhttp.jar:/system/framework/core-junit.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/mms-common.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/apache-xml.jar
|
||||
export BOOTCLASSPATH /system/framework/core.jar:/system/framework/conscrypt.jar:/system/framework/okhttp.jar:/system/framework/core-junit.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/mms-common.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/apache-xml.jar
|
||||
|
||||
# Backward compatibility
|
||||
symlink /system/etc /etc
|
||||
|
|
Loading…
Reference in New Issue