commit 9937ed7ad984325f1a6619f9f72d28555c8de796
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 17 01:05:01 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 17 01:05:01 2016 +0000
tree 955e975ad5cb03c314ae7d3cd42a9ab148b599cf
parent 922cf1700485249b479edc4e281197d9c9b48630
parent 86195c58213cc0f3ff44261101b09478f8c1040d

Merge "Pass permitted_path to the linker as is."

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));