commit d5d2c56023ee235e97f3ea208e529775c19578ee
author Dimitry Ivanov <dimitry@google.com> Tue May 17 04:06:05 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 17 04:06:05 2016 +0000
tree d02970801076373ceafed20ec38c004e5843bf03
parent 37444f419684e46cd03344a59a438b53c3c38631
parent f29876797e1efc2c9202f47a60ca23c5dbe6398f

Pass permitted_path to the linker as is.
am: 25df4bff44

* commit '25df4bff44a0d1a342dc45521bf7e860b3fef947':
  Pass permitted_path to the linker as is.

Change-Id: Idf8459267f8e1cc7bebc9a55b1272871b3d8119a

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index 73423a3..f185890 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -101,9 +101,7 @@
                                   nullptr,
                                   library_path.c_str(),
                                   namespace_type,
-                                  !permitted_path.empty() ?
-                                      permitted_path.c_str() :
-                                      nullptr);
+                                  permitted_path.c_str());
 
     if (ns != nullptr) {
       namespaces_.push_back(std::make_pair(env->NewWeakGlobalRef(class_loader), ns));