Commit c2bd53d8 authored by Clark DuVall's avatar Clark DuVall Committed by Chromium LUCI CQ

Remove custom library resolver for feed libraries

This was needed because the libraries were in the feed module, but have
now been moved to the base module. This will hopefully fix a crash
loading the libs on some devices.

Bug: 1160654
Change-Id: Ie33114d6f5963325c096dea9f60e029d7d40e19e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2606187Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839654}
parent f35769c8
...@@ -8,7 +8,6 @@ import android.content.Context; ...@@ -8,7 +8,6 @@ import android.content.Context;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import org.chromium.base.BundleUtils;
import org.chromium.base.ContextUtils; import org.chromium.base.ContextUtils;
import org.chromium.base.Log; import org.chromium.base.Log;
import org.chromium.base.ThreadUtils; import org.chromium.base.ThreadUtils;
...@@ -34,7 +33,6 @@ public class FeedProcessScopeDependencyProvider implements ProcessScopeDependenc ...@@ -34,7 +33,6 @@ public class FeedProcessScopeDependencyProvider implements ProcessScopeDependenc
private Context mContext; private Context mContext;
private ImageFetchClient mImageFetchClient; private ImageFetchClient mImageFetchClient;
private LibraryResolver mLibraryResolver;
@VisibleForTesting @VisibleForTesting
static PrivacyPreferencesManager sPrivacyPreferencesManagerForTest; static PrivacyPreferencesManager sPrivacyPreferencesManagerForTest;
...@@ -42,11 +40,6 @@ public class FeedProcessScopeDependencyProvider implements ProcessScopeDependenc ...@@ -42,11 +40,6 @@ public class FeedProcessScopeDependencyProvider implements ProcessScopeDependenc
FeedProcessScopeDependencyProvider() { FeedProcessScopeDependencyProvider() {
mContext = createFeedContext(ContextUtils.getApplicationContext()); mContext = createFeedContext(ContextUtils.getApplicationContext());
mImageFetchClient = new FeedImageFetchClient(); mImageFetchClient = new FeedImageFetchClient();
if (BundleUtils.isIsolatedSplitInstalled(mContext, FEED_SPLIT_NAME)) {
mLibraryResolver = (libName) -> {
return BundleUtils.getNativeLibraryPath(libName, FEED_SPLIT_NAME);
};
}
} }
@Override @Override
...@@ -111,11 +104,6 @@ public class FeedProcessScopeDependencyProvider implements ProcessScopeDependenc ...@@ -111,11 +104,6 @@ public class FeedProcessScopeDependencyProvider implements ProcessScopeDependenc
PostTask.postDelayedTask(traits, task, delayMs); PostTask.postDelayedTask(traits, task, delayMs);
} }
@Override
public LibraryResolver getLibraryResolver() {
return mLibraryResolver;
}
@Override @Override
public boolean isXsurfaceUsageAndCrashReportingEnabled() { public boolean isXsurfaceUsageAndCrashReportingEnabled() {
PrivacyPreferencesManager manager = sPrivacyPreferencesManagerForTest; PrivacyPreferencesManager manager = sPrivacyPreferencesManagerForTest;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment