diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-04 14:53:29 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-04 14:53:29 +0000 |
| commit | 5d99869937d7d520ff8e4a07dfe8e7bd0ae73e01 (patch) | |
| tree | e0ff8d6283514c23b9b3faf118fad2e9c75853e2 | |
| parent | 8a85fc133350eb1e5a100e3af99e023f6a831379 (diff) | |
| parent | de89c379921383d76812fb1f4f034480327b4b4a (diff) | |
| download | vogar-5d99869937d7d520ff8e4a07dfe8e7bd0ae73e01.tar.gz | |
Snap for 10900817 from de89c379921383d76812fb1f4f034480327b4b4a to sdk-releaseplatform-tools-34.0.5
Change-Id: Icfc06192122c845f936947644aa3e3301c139550
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | src/vogar/android/DeviceRuntime.java | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -30,7 +30,7 @@ LOCAL_JAVA_RESOURCE_DIRS := resources LOCAL_STATIC_JAVA_LIBRARIES := \ caliper \ - caliper-gson \ + gson \ guava \ junit \ testng \ 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) |