diff options
| author | Andreas Gampe <agampe@google.com> | 2014-07-25 02:32:19 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-07-26 18:35:08 -0700 |
| commit | 855564b83db7b106d2995d0e784f1f4b62e52371 (patch) | |
| tree | de3caa3f36b24acb9279a8cb85d4879baeed1798 /runtime/runtime.cc | |
| parent | 3bcac48f23094fa0f46315a080ec47fc368fd4c2 (diff) | |
| download | art-855564b83db7b106d2995d0e784f1f4b62e52371.zip art-855564b83db7b106d2995d0e784f1f4b62e52371.tar.gz art-855564b83db7b106d2995d0e784f1f4b62e52371.tar.bz2 | |
ART: Native bridge command-line parameter
Add a command-line parameter for the native bridge library, slight
refactor/cleanup.
Add run-test 115 to test the native bridge interface. Currently the
tests are black-listed for the target, as the setup for the test
is too complicated in the current infrastructure.
Change-Id: I6ccf19485e8c30b96e9f2fd5425278cb1ebd403f
Diffstat (limited to 'runtime/runtime.cc')
| -rw-r--r-- | runtime/runtime.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index b7eae85..1cbf841 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -63,6 +63,7 @@ #include "mirror/stack_trace_element.h" #include "mirror/throwable.h" #include "monitor.h" +#include "native_bridge.h" #include "parsed_options.h" #include "oat_file.h" #include "quick/quick_method_frame_info.h" @@ -718,6 +719,9 @@ bool Runtime::Init(const RuntimeOptions& raw_options, bool ignore_unrecognized) pre_allocated_OutOfMemoryError_ = self->GetException(NULL); self->ClearException(); + // Look for a native bridge. + NativeBridge::SetNativeBridgeLibraryString(options->native_bridge_library_string_); + VLOG(startup) << "Runtime::Init exiting"; return true; } |