commit 15554a2f2d4920357f6cf1a0505a178de3781f77
author Brian Carlstrom <bdc@google.com> Wed May 01 00:57:28 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 01 00:57:28 2013 +0000
tree ac91797eea6fe1fc06176167187fa27533422615
parent b66781c5bf4da1f6fdcbc5a1fcd2c962294b661c
parent 49e49a96a739f009dbfa3296010474ff69ea1821

Merge "Update dalvik host script for new conscrypt and okhttp classpath entries"

vm/dalvik

diff --git a/vm/dalvik b/vm/dalvik
index cb46775..9229e5a 100644
--- a/vm/dalvik
+++ b/vm/dalvik
@@ -23,6 +23,8 @@
 exec $ANDROID_BUILD_TOP/out/host/linux-x86/bin/dalvikvm \
 -Xbootclasspath\
 :$ANDROID_BUILD_TOP/out/host/linux-x86/framework/core-hostdex.jar\
+:$ANDROID_BUILD_TOP/out/host/linux-x86/framework/conscrypt-hostdex.jar\
+:$ANDROID_BUILD_TOP/out/host/linux-x86/framework/okhttp-hostdex.jar\
 :$ANDROID_BUILD_TOP/out/host/linux-x86/framework/bouncycastle-hostdex.jar\
 :$ANDROID_BUILD_TOP/out/host/linux-x86/framework/apache-xml-hostdex.jar \
 $*