Merge "Let dalvikvm default based on persist.sys.dalvik.vm.lib" into dalvik-dev
diff --git a/dalvikvm/dalvikvm.cc b/dalvikvm/dalvikvm.cc
index dd68da0..1672099 100644
--- a/dalvikvm/dalvikvm.cc
+++ b/dalvikvm/dalvikvm.cc
@@ -124,7 +124,7 @@
   //
   // [Do we need to catch & handle "-jar" here?]
   bool need_extra = false;
-  const char* lib = "libdvm.so";
+  const char* lib = NULL;
   const char* what = NULL;
   int curr_opt, arg_idx;
   for (curr_opt = arg_idx = 0; arg_idx < argc; arg_idx++) {