am 611b8b55: am fd684f6d: Merge "Always setup the native bridge library" into lmp-dev

* commit '611b8b55d7d3b6239849eeb37760a20d7246a173':
  Always setup the native bridge library

diff --cc runtime/parsed_options.cc
Simple merge

diff --cc runtime/parsed_options.h
index 1afd610,0377e7d..5c71f98
--- 1/runtime/parsed_options.h
--- 2/runtime/parsed_options.h
+++ b/runtime/parsed_options.h
@@@ -44,9 -44,8 +44,9 @@@ class ParsedOptions 
    std::string class_path_string_;
    std::string image_;
    bool check_jni_;
 +  bool force_copy_;
    std::string jni_trace_;
-   std::string native_bridge_library_path_;
+   std::string native_bridge_library_filename_;
    CompilerCallbacks* compiler_callbacks_;
    bool is_zygote_;
    bool must_relocate_;

diff --cc runtime/runtime.cc
Simple merge