Commit 024b7210 authored by Clark DuVall's avatar Clark DuVall Committed by Commit Bot

Mark AndroidNetworkLibrary as @MainDex

When network service runs out of process, it uses a privileged
process similar to the GPU process. The network process needs
access to AndroidNetworkLibrary, which was not in the main dex.
This was causing many failures when running tests with network
service turned on on KitKat devices, see example failures:
https://ci.chromium.org/p/chromium/builders/luci.chromium.try/android-kitkat-arm-rel/113359

The failures are throwing a ClassNotFoundException for
AndroidNetworkLibrary.

Bug: 827531
Change-Id: I9003a8469719e06cb5a05482d5b7cf24980a32b0
Reviewed-on: https://chromium-review.googlesource.com/c/1306344Reviewed-by: default avataragrieve <agrieve@chromium.org>
Reviewed-by: default avatarEric Roman <eroman@chromium.org>
Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603967}
parent 56a6b038
...@@ -27,6 +27,7 @@ import org.chromium.base.ContextUtils; ...@@ -27,6 +27,7 @@ import org.chromium.base.ContextUtils;
import org.chromium.base.VisibleForTesting; import org.chromium.base.VisibleForTesting;
import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.CalledByNativeUnchecked; import org.chromium.base.annotations.CalledByNativeUnchecked;
import org.chromium.base.annotations.MainDex;
import org.chromium.base.compat.ApiHelperForM; import org.chromium.base.compat.ApiHelperForM;
import java.io.FileDescriptor; import java.io.FileDescriptor;
...@@ -51,8 +52,8 @@ import java.util.List; ...@@ -51,8 +52,8 @@ import java.util.List;
/** /**
* This class implements net utilities required by the net component. * This class implements net utilities required by the net component.
*/ */
@MainDex
class AndroidNetworkLibrary { class AndroidNetworkLibrary {
private static final String TAG = "AndroidNetworkLibrary"; private static final String TAG = "AndroidNetworkLibrary";
// Cached Method for LinkProperties.isPrivateDnsActive(). // Cached Method for LinkProperties.isPrivateDnsActive().
......
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