commit 10df8cef6949a1e7842bd3f4462e7e8beaa851e9
author Dimitry Ivanov <dimitry@google.com> Tue May 17 04:05:43 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 17 04:05:43 2016 +0000
tree 426b2eb66b881937b0823ce75b29831580ffd9a4
parent b8467b6562a27e3e6a2473d2604774b8cae129bd
parent f29876797e1efc2c9202f47a60ca23c5dbe6398f

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

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

Change-Id: I46db0abda9d9e1855af499fce47b899f278d0658

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index 488608a..44f17cd 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));