commit | 3d76933675895667f212500a65c9c7ea2b6209fc | [log] [tgz] |
---|---|---|
author | Brian Carlstrom <bdc@google.com> | Fri Jul 12 03:40:03 2013 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 12 03:40:03 2013 +0000 |
tree | 4eaa18f45a2bd1a9327835f3849e386e829e9184 | |
parent | b1a5879d2c87a5af9f8dbd63a112b138b87135e4 [diff] | |
parent | 934313b5b14474fee3b84bbda0f0d3fe4805c63f [diff] |
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++) {