commit 785049f8083e56e88dfeab5ff74fb3817f9854e3
author Dmitriy Ivanov <dimitry@google.com> Fri Jul 18 10:08:57 2014 -0700
committer Dmitriy Ivanov <dimitry@google.com> Mon Mar 23 11:38:54 2015 -0700
tree ab06a7fb4acb2ed73eed4b58327ba485f61560c4
parent f5988cf0c47ff935bb19c89ed0398be5fbe44bb6

Add paths to apk!lib/<abi> to LD_LIBRARY_PATH

  Add paths to .apk to LD_LIBRARY_PATH to enable
  bionic linker's "open from zip-file" feature.

Bug: 8076853
Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 0f0c327..2dacfe2 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -792,6 +792,8 @@
   verify_ = runtime_options.GetOrDefault(Opt::Verify);
   allow_dex_file_fallback_ = !runtime_options.Exists(Opt::NoDexFileFallback);
 
+  Split(runtime_options.GetOrDefault(Opt::CpuAbiList), ',', &cpu_abilist_);
+
   if (runtime_options.GetOrDefault(Opt::Interpret)) {
     GetInstrumentation()->ForceInterpretOnly();
   }