Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 152a4321 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am d14586e3: resolved conflicts for merge of a69af5af to jb-mr2-dev-plus-aosp 

* commit 'd14586e3':
  Track change to JSSE provider
parents ada3291c d14586e3

rootdir/init.rc

+1 −1
Original line number Diff line number Diff line
@@ -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