diff options
| author | Kenny Root <kroot@google.com> | 2013-04-29 23:20:37 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-04-29 23:20:37 -0700 |
| commit | d14586e35a3df39cc3aa6aff6a54463270a5e1a7 (patch) | |
| tree | b1c1ce7f373b838d9b9a6a7e1375693091b2a7b3 /rootdir | |
| parent | 14ad786183455ad9c8298e24946d4da0f24458d7 (diff) | |
| parent | a69af5af3daf7901bb66cd6318b6018a48b819f4 (diff) | |
| download | system_core-d14586e35a3df39cc3aa6aff6a54463270a5e1a7.zip system_core-d14586e35a3df39cc3aa6aff6a54463270a5e1a7.tar.gz system_core-d14586e35a3df39cc3aa6aff6a54463270a5e1a7.tar.bz2 | |
resolved conflicts for merge of a69af5af to jb-mr2-dev-plus-aosp
Change-Id: If41560f0fef3103cad2172061a7988ceb5556377
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/init.rc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index cec7d54..09e8238 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -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 |