diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-04-03 14:12:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-03 14:12:25 -0700 |
| commit | 294c9ce2177a24d5034b81e965373ff1d3287178 (patch) | |
| tree | 23135b85ed389619861d43f3f467cc99b1273a85 | |
| parent | 709928de499013270f4f788e40f975df3d7dd38b (diff) | |
| parent | 76c674451c831c1e9c3e3ee134ea8af26ae19ac1 (diff) | |
| download | system_core-294c9ce2177a24d5034b81e965373ff1d3287178.zip system_core-294c9ce2177a24d5034b81e965373ff1d3287178.tar.gz system_core-294c9ce2177a24d5034b81e965373ff1d3287178.tar.bz2 | |
am 76c67445: Merge "resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp" into jb-mr2-dev-plus-aosp
* commit '76c674451c831c1e9c3e3ee134ea8af26ae19ac1':
Add OkHttp to the boot classpath.
| -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 89ec18a..c3ef503 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 |