diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-04-03 14:03:13 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-04-03 14:03:13 -0700 |
| commit | d3f0e0ae379f4420b01bb9de932a764c035ff2a6 (patch) | |
| tree | 8f9e753071a5bbf08eac924b576c09efd5990e54 /rootdir | |
| parent | 145d61e0c7f2584c65d6eb454496013408d707af (diff) | |
| parent | 02e8d73079e279fac152d1d3caf36afaeab6c5bf (diff) | |
| download | system_core-d3f0e0ae379f4420b01bb9de932a764c035ff2a6.zip system_core-d3f0e0ae379f4420b01bb9de932a764c035ff2a6.tar.gz system_core-d3f0e0ae379f4420b01bb9de932a764c035ff2a6.tar.bz2 | |
resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp
Change-Id: I63d6a2f975a6c0df5c238a2f7592f357441eb767
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 e6583e3..e8871c4 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/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/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 |