base/android/java/src/org/chromium/base/library_loader/Linker.java - Issue 952893003: Update from https://crrev.com/317530

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 952893003: Update from https://crrev.com/317530 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Fix gn for nacl Created 5 years, 10 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:

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 23f953c24a8c7693209374a90acc87c4eeb1d4be..bbf76cbd1792b07121bbff481e1ca82be79ae0eb 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

@@ -1039,7 +1039,7 @@ public class Linker {

mLoadSize = in.readLong();

mRelroStart = in.readLong();

mRelroSize = in.readLong();

- ParcelFileDescriptor fd = in.readFileDescriptor();

+ ParcelFileDescriptor fd = ParcelFileDescriptor.CREATOR.createFromParcel(in);

// If CreateSharedRelro fails, the OS file descriptor will be -1 and |fd| will be null.

mRelroFd = (fd == null) ? -1 : fd.detachFd();

}