Skip to content

Commit

Permalink
Merge pull request #39 from koreader/houqp-master
Browse files Browse the repository at this point in the history
dl.lua: skip libdl.so
  • Loading branch information
chrox committed Mar 21, 2016
2 parents fea0874 + caca2fd commit 565a792
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion assets/dl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,12 @@ function dl.dlopen(library, load_func)
-- we do _not_ pass the load_func to the cascaded
-- calls, so those will always use sys_dlopen()
for _, needed in pairs(lib:dlneeds()) do
dl.dlopen(needed)
-- for android >= 6.0, you can't load system library anymore
-- and since we also have our own dl implementation, it's safe
-- to skip the stock libdl.
if needed ~= "libdl.so" then
dl.dlopen(needed)
end
end
return load_func(lname)
end
Expand Down

0 comments on commit 565a792

Please sign in to comment.