diff options
| author | David Srbecky <dsrbecky@google.com> | 2023-09-01 22:24:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-01 22:24:04 +0000 |
| commit | 41f7a9ca3d0d37f2f1e577777aec3fecf517b0d2 (patch) | |
| tree | e306796726450c537b193b58cfa6445ed8dcc8c5 | |
| parent | 6386bb283263351bddd6e4541ab3d1955d0705e2 (diff) | |
| parent | da8bf8fcde0923197ee145ab944d9b14e268702c (diff) | |
| download | vogar-41f7a9ca3d0d37f2f1e577777aec3fecf517b0d2.tar.gz | |
Avoid using libnetd_client in ART tests am: 1ae8951efb am: da8bf8fcde
Original change: https://android-review.googlesource.com/c/platform/external/vogar/+/2735763
Change-Id: I75e170ff3e9cab082ffacaba9f259d98aebe71c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/vogar/android/DeviceRuntime.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/vogar/android/DeviceRuntime.java b/src/vogar/android/DeviceRuntime.java index 2b5f01f..e10bd36 100644 --- a/src/vogar/android/DeviceRuntime.java +++ b/src/vogar/android/DeviceRuntime.java @@ -89,6 +89,9 @@ public final class DeviceRuntime implements Mode { // If you edit this, see also HostRuntime... VmCommandBuilder vmCommandBuilder = new VmCommandBuilder(run.log) .env("ANDROID_DATA", run.getAndroidDataPath()) + // b/150126287: avoid using libnetd_client within chroot, + // as it might not match the netd running outside chroot. + .env("ANDROID_NO_USE_FWMARK_CLIENT", "1") .workingDirectory(workingDirectory) .vmCommand(vmCommand) .vmArgs("-Duser.home=" + run.deviceUserHome) |