diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2016-12-07 19:18:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-07 19:18:33 +0100 |
| commit | ad10608302dbe35277df21a1a497e573579f63a4 (patch) | |
| tree | fee7b36138a25e4ac200a0f6b210ea19e779fb91 | |
| parent | 1b9d88b0827aed4533de03a41681b05112b91a0a (diff) | |
| parent | cdeb076eb4a74b95043887032dbbd78c5a128e9f (diff) | |
Merge pull request #11077 from MartijnKaijser/11059
FIX: [droid;dyload] never dyload dependent sytem libs
| -rw-r--r-- | xbmc/platform/android/loader/AndroidDyload.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xbmc/platform/android/loader/AndroidDyload.cpp b/xbmc/platform/android/loader/AndroidDyload.cpp index 2e2409a901..abad91123a 100644 --- a/xbmc/platform/android/loader/AndroidDyload.cpp +++ b/xbmc/platform/android/loader/AndroidDyload.cpp @@ -284,14 +284,16 @@ void* CAndroidDyload::Open_Internal(std::string filename, bool checkSystem) if (*j == libName.c_str()) continue; + // Don't dlopen system libs + if (IsSystemLib(*j)) + continue; + if (FindInDeps(*j)) continue; handle = Find(*j); if (handle) { - if (IsSystemLib(*j) && !checkSystem) - continue; recursivelibdep dep; dep.handle = handle; dep.filename = *j; |