diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-05-17 01:05:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-17 01:05:01 +0000 |
| commit | a214a769f9a98b0962e62bd716575a05cf6f9f59 (patch) | |
| tree | 955e975ad5cb03c314ae7d3cd42a9ab148b599cf /libnativeloader/native_loader.cpp | |
| parent | 210fdc2742d3cadaa2f8255ad22b4a2b7bdbf743 (diff) | |
| parent | b31caa95ec1ab9da7b300544e9716c1cac92d8f8 (diff) | |
Merge "Pass permitted_path to the linker as is."
Diffstat (limited to 'libnativeloader/native_loader.cpp')
| -rw-r--r-- | libnativeloader/native_loader.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp index 927cbec67..79518cac5 100644 --- a/libnativeloader/native_loader.cpp +++ b/libnativeloader/native_loader.cpp @@ -99,9 +99,7 @@ class LibraryNamespaces { 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)); |