Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Unified Diff: base/android/java/src/org/chromium/base/library_loader/Linker.java

Issue 2079333003: 🎃 Fix incremental install on latest version of Android N (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove dependent patchset Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/java/src/org/chromium/base/library_loader/Linker.java
diff --git a/base/android/java/src/org/chromium/base/library_loader/Linker.java b/base/android/java/src/org/chromium/base/library_loader/Linker.java
index 8b8d906eb706f7c7145bf119d6b5b083a97f321a..e6f72bc880f1931e48be97a3a7e82b1002828a4f 100644
--- a/base/android/java/src/org/chromium/base/library_loader/Linker.java
+++ b/base/android/java/src/org/chromium/base/library_loader/Linker.java
@@ -10,6 +10,7 @@ import android.os.Parcel;
import android.os.ParcelFileDescriptor;
import android.os.Parcelable;
+import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
import org.chromium.base.annotations.AccessedByNative;
@@ -239,7 +240,12 @@ public abstract class Linker {
public static final Linker getInstance() {
synchronized (sSingletonLock) {
if (sSingleton == null) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ // With incremental install, it's important to fall back to the "normal"
+ // library loading path in order for the libraries to be found.
+ String appClass =
+ ContextUtils.getApplicationContext().getApplicationInfo().className;
+ boolean isIncrementalInstall = appClass.contains("incrementalinstall");
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !isIncrementalInstall) {
sSingleton = ModernLinker.create();
} else {
sSingleton = LegacyLinker.create();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698