aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Srbecky <dsrbecky@google.com>2023-09-01 17:15:12 +0100
committerDavid Srbecky <dsrbecky@google.com>2023-09-01 17:15:12 +0100
commit1ae8951efb4bd90e0ab02227529d2316a99ba6ad (patch)
treee306796726450c537b193b58cfa6445ed8dcc8c5
parent71457422ecc0882c267838d8cd98cc7f7f7b2af4 (diff)
downloadvogar-1ae8951efb4bd90e0ab02227529d2316a99ba6ad.tar.gz
Avoid using libnetd_client in ART tests
Bug: 150126287 Test: art/tools/run-libcore-tests.sh --mode=device --variant=X64 Test: art/tools/run-libjdwp-tests.sh --mode=device --variant=X64 Change-Id: I59a6325237ab8556d3ad1ea0ce503bcd00208900
-rw-r--r--src/vogar/android/DeviceRuntime.java3
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)