diff options
| author | Ian Rogers <irogers@google.com> | 2014-07-17 11:09:10 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-08-08 08:29:53 -0700 |
| commit | 68d8b42ddec39ec0174162d90d4abaa004d1983e (patch) | |
| tree | 0bb6ccf3b996bb8363c10d07aa39cde221980602 /runtime/parsed_options.cc | |
| parent | 9c522c2cbbf50dc687728747b37ad59985750b65 (diff) | |
| download | art-68d8b42ddec39ec0174162d90d4abaa004d1983e.tar.gz art-68d8b42ddec39ec0174162d90d4abaa004d1983e.tar.bz2 art-68d8b42ddec39ec0174162d90d4abaa004d1983e.zip | |
Wire up check JNI force copy mode.
Increase check JNI checks.
Break apart jni_internal.h in to jni_env_ext.h and java_vm_ext.h.
Fix the abuse of ScopedObjectAccess/annotalysis by ScopedCheck in the case
of VM routines.
Make class loader override and shared library class loader JNI global
references rather than mirror pointers.
Clean-ups to native bridge.
Change-Id: If7c6110b5aade7a402bfb67534af86a7b2cdeb55
Diffstat (limited to 'runtime/parsed_options.cc')
| -rw-r--r-- | runtime/parsed_options.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc index 49f658507d..12f9f33f5f 100644 --- a/runtime/parsed_options.cc +++ b/runtime/parsed_options.cc @@ -177,6 +177,7 @@ bool ParsedOptions::Parse(const RuntimeOptions& options, bool ignore_unrecognize } // -Xcheck:jni is off by default for regular builds but on by default in debug builds. check_jni_ = kIsDebugBuild; + force_copy_ = false; heap_initial_size_ = gc::Heap::kDefaultInitialSize; heap_maximum_size_ = gc::Heap::kDefaultMaximumSize; @@ -300,6 +301,8 @@ bool ParsedOptions::Parse(const RuntimeOptions& options, bool ignore_unrecognize } } else if (StartsWith(option, "-Xcheck:jni")) { check_jni_ = true; + } else if (StartsWith(option, "-Xjniopts:forcecopy")) { + force_copy_ = true; } else if (StartsWith(option, "-Xrunjdwp:") || StartsWith(option, "-agentlib:jdwp=")) { std::string tail(option.substr(option[1] == 'X' ? 10 : 15)); // TODO: move parsing logic out of Dbg @@ -613,7 +616,6 @@ bool ParsedOptions::Parse(const RuntimeOptions& options, bool ignore_unrecognize StartsWith(option, "-Xint:") || StartsWith(option, "-Xdexopt:") || (option == "-Xnoquithandler") || - StartsWith(option, "-Xjniopts:") || StartsWith(option, "-Xjnigreflimit:") || (option == "-Xgenregmap") || (option == "-Xnogenregmap") || |