commit f7d2b8276ad3020c9f5c8accf26ba78e2e1a05c1
author Dimitry Ivanov <dimitry@google.com> Tue May 17 01:13:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 17 01:13:29 2016 +0000
tree 955e975ad5cb03c314ae7d3cd42a9ab148b599cf
parent 881b440b7a228e065d4b42ec71add07fbcb336c4
parent a214a769f9a98b0962e62bd716575a05cf6f9f59

Merge "Pass permitted_path to the linker as is."
am: a214a769f9

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

Change-Id: Ic4d8e6a67ca069319d872e6f3dcb76e857162093

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index 927cbec..79518ca 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -99,9 +99,7 @@
                                   nullptr,
                                   library_path.c_str(),
                                   namespace_type,
-                                  java_permitted_path != nullptr ?
-                                      permitted_path.c_str() :
-                                      nullptr);
+                                  permitted_path.c_str());
 
     if (ns != nullptr) {
       namespaces_.push_back(std::make_pair(env->NewWeakGlobalRef(class_loader), ns));