aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-09-21 22:05:57 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-09-21 22:05:57 +0000
commit6fb0c2be467e59f1f1d2e8abb9af5813f2288767 (patch)
treee306796726450c537b193b58cfa6445ed8dcc8c5
parent976cee74dbfd917adfe6125ab08fdac42a79820a (diff)
parent9bea6ead84891043eddfe3125c393b4937537a78 (diff)
downloadvogar-6fb0c2be467e59f1f1d2e8abb9af5813f2288767.tar.gz
Snap for 10843824 from 9bea6ead84891043eddfe3125c393b4937537a78 to 24Q1-release
Change-Id: Ia0f0b4ac239cba93322a80d4a71568afe01bee28
-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)