diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-03-05 20:09:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-05 20:09:52 +0000 |
| commit | aa1d023bb9a9be36106423b567291b3f2174860f (patch) | |
| tree | c1332e813cd72b7102058292970c488f9856c5c8 /include | |
| parent | 216ce34d045cde0c5383f844ba0375aac476cb9e (diff) | |
| parent | 674fd6c442cd3886b3ab12be1d36c5d05ef48cdb (diff) | |
| download | frameworks_base-aa1d023bb9a9be36106423b567291b3f2174860f.zip frameworks_base-aa1d023bb9a9be36106423b567291b3f2174860f.tar.gz frameworks_base-aa1d023bb9a9be36106423b567291b3f2174860f.tar.bz2 | |
am 674fd6c4: am a258b4a9: am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime"
* commit '674fd6c442cd3886b3ab12be1d36c5d05ef48cdb':
Add dex2oat-flags plumbing to AndroidRuntime
Diffstat (limited to 'include')
| -rw-r--r-- | include/android_runtime/AndroidRuntime.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/android_runtime/AndroidRuntime.h b/include/android_runtime/AndroidRuntime.h index 0b3ce9a..649f4c3 100644 --- a/include/android_runtime/AndroidRuntime.h +++ b/include/android_runtime/AndroidRuntime.h @@ -115,7 +115,7 @@ public: private: static int startReg(JNIEnv* env); - void parseExtraOpts(char* extraOptsBuf); + void parseExtraOpts(char* extraOptsBuf, const char* quotingArg); int startVm(JavaVM** pJavaVM, JNIEnv** pEnv); Vector<JavaVMOption> mOptions; |