diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2016-05-17 04:06:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-17 04:06:05 +0000 |
| commit | d98683f415db73668378e1945d4eb5c9dc2d0a18 (patch) | |
| tree | d02970801076373ceafed20ec38c004e5843bf03 /libnativeloader | |
| parent | 8781256b19619a142b671db94eef12cbcbe59bd9 (diff) | |
| parent | 25df4bff44a0d1a342dc45521bf7e860b3fef947 (diff) | |
| download | system_core-d98683f415db73668378e1945d4eb5c9dc2d0a18.tar.gz system_core-d98683f415db73668378e1945d4eb5c9dc2d0a18.tar.bz2 system_core-d98683f415db73668378e1945d4eb5c9dc2d0a18.zip | |
Pass permitted_path to the linker as is.
am: 25df4bff44
* commit '25df4bff44a0d1a342dc45521bf7e860b3fef947':
Pass permitted_path to the linker as is.
Change-Id: Idf8459267f8e1cc7bebc9a55b1272871b3d8119a
Diffstat (limited to 'libnativeloader')
| -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 73423a3c6..f1858904a 100644 --- a/libnativeloader/native_loader.cpp +++ b/libnativeloader/native_loader.cpp @@ -101,9 +101,7 @@ class LibraryNamespaces { 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)); |