diff options
author | Brian Carlstrom <bdc@google.com> | 2011-04-01 15:49:41 -0700 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2011-04-01 16:00:23 -0700 |
commit | 08065b9f09ead8895d97b2971622af8c179e1768 (patch) | |
tree | 6bd821f0c111e72ea84f3e7f736e082800721a12 /core/jni/AndroidRuntime.cpp | |
parent | 827107f4ec7d9a53d7bb6e4071858252f263fa8c (diff) | |
download | frameworks_base-08065b9f09ead8895d97b2971622af8c179e1768.zip frameworks_base-08065b9f09ead8895d97b2971622af8c179e1768.tar.gz frameworks_base-08065b9f09ead8895d97b2971622af8c179e1768.tar.bz2 |
Tracking merge of dalvik-dev to master
git cherry-pick --no-commit a80febd83c8bf0b6717da2a7136179bdc906a5b7
git cherry-pick --no-commit 5e642b41cf44c5da7afdd95ab3d5e2bdbf7b31dd
git cherry-pick --no-commit 4886db14c9eee4b6fee69bd54c57c5af04709c4c
git cherry-pick --no-commit 560c685e448769904047507b9484ce8111967d7e
git cherry-pick --no-commit 63dde7a2fcfa53dc531558635b64cea613d3cdb4
git cherry-pick --no-commit 74e5cb91060a379d98dd3a333b5f231bfb4f502e
git cherry-pick --no-commit 1cc8c9708b555e2e338b7798d38887a2fefcfea6
git cherry-pick --no-commit 09625a21f5abe0c0db15757f58585d552d62c3d7
git cherry-pick --no-commit fcb02dfe0f5a2bb7c07e6d6fc69f756a484b5458
git cherry-pick --no-commit a68cb7fa3ab42854768b8145ff85231663770292
git cherry-pick --no-commit 716beb1c131dd2c6b805d4f681debaa20075010c
git cherry-pick --no-commit 8c29b1097a7afe3a77e27546a56e396f3620a4ec
git cherry-pick --no-commit 9c6a1a55d1c8086c1cc57464eea43725694ff70c
git cherry-pick --no-commit b14f5ea5c57acdd009ba5b51f1bbe430f3d353b8
Change-Id: I8cc94175441b009e23549762d6baee1dbace4881
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
-rw-r--r-- | core/jni/AndroidRuntime.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index e4eb692..74155b1 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -698,6 +698,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) case 'n': val = "-Xdexopt:none"; break; case 'v': val = "-Xdexopt:verified"; break; case 'a': val = "-Xdexopt:all"; break; + case 'f': val = "-Xdexopt:full"; break; default: val = NULL; break; } |