Skip to content

Fixed for library loader in SoLoader sdk. #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ankithbti52509 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed for library loader in SoLoader sdk. #146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions java/com/facebook/soloader/DirectApkSoSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,24 +120,24 @@ public String getLibraryPath(String soName) throws IOException {
Set<String> directApkPathSet = new HashSet<>();

final String apkPath = aInfo.sourceDir;
final @Nullable String fallbackApkLdPath = getFallbackApkLdPath(apkPath);
if (fallbackApkLdPath != null) {
directApkPathSet.add(fallbackApkLdPath);
final @Nullable Set<String> fallbackApkLdPath = getFallbackApkLdPath(apkPath);
if (fallbackApkLdPath != null && fallbackApkLdPath.size() != 0) {
directApkPathSet.addAll(fallbackApkLdPath);
}

if (aInfo.splitSourceDirs != null) {
for (String splitApkPath : aInfo.splitSourceDirs) {
final @Nullable String fallbackSplitApkLdPath = getFallbackApkLdPath(splitApkPath);
if (fallbackSplitApkLdPath != null) {
directApkPathSet.add(fallbackSplitApkLdPath);
final @Nullable Set<String> fallbackSplitApkLdPath = getFallbackApkLdPath(splitApkPath);
if (fallbackSplitApkLdPath != null && fallbackSplitApkLdPath != 0) {
directApkPathSet.addAll(fallbackSplitApkLdPath);
}
}
}

return directApkPathSet;
}

private static @Nullable String getFallbackApkLdPath(String apkPath) {
private static @Nullable Set<String> getFallbackApkLdPath(String apkPath) {
final String[] supportedAbis = SysUtil.getSupportedAbis();
if (apkPath == null || apkPath.isEmpty()) {
LogUtil.w(
Expand All @@ -152,7 +152,11 @@ public String getLibraryPath(String soName) throws IOException {
+ ((supportedAbis == null) ? "null" : "empty"));
return null;
}
return apkPath + "!/lib/" + supportedAbis[0];
Set<String> apkLdPaths = new HashSet<>();
for (String supportedAbi : supportedAbis) {
apkLdPaths.add(apkPath + "!/lib/" + supportedAbi);
}
return apkLdPaths;
}

private void loadDependencies(
Expand Down