diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-27 00:05:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-27 00:05:19 +0000 |
| commit | b4d50237beccb704ef7e87cb274b69b7c7247612 (patch) | |
| tree | f29bd4cd8fb2960d05d92dd06b41627ada491206 | |
| parent | aba2903baa695a7364f666c7bae91ae38d0b9907 (diff) | |
| parent | 97d209fa204fe3b7c7611050e8af757a31d16b79 (diff) | |
| download | cuttlefish-b4d50237beccb704ef7e87cb274b69b7c7247612.tar.gz | |
Merge "Avoid checking FLAGS_gpu_mode for true GPU mode" am: 97d209fa20
Original change: https://android-review.googlesource.com/c/device/google/cuttlefish/+/1607094
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic41d9943821c16731932c4ce632ef79f93c87317
| -rw-r--r-- | host/commands/assemble_cvd/flags.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/commands/assemble_cvd/flags.cc b/host/commands/assemble_cvd/flags.cc index 45100beb0..72fc86a46 100644 --- a/host/commands/assemble_cvd/flags.cc +++ b/host/commands/assemble_cvd/flags.cc @@ -653,8 +653,8 @@ CuttlefishConfig InitializeCuttlefishConfiguration( instance.set_audiocontrol_server_port(9410); /* OK to use the same port number across instances */ instance.set_config_server_port(calc_vsock_port(6800)); - if (FLAGS_gpu_mode != kGpuModeDrmVirgl && - FLAGS_gpu_mode != kGpuModeGfxStream) { + if (tmp_config_obj.gpu_mode() != kGpuModeDrmVirgl && + tmp_config_obj.gpu_mode() != kGpuModeGfxStream) { instance.set_frames_server_port(calc_vsock_port(6900)); if (FLAGS_vm_manager == QemuManager::name()) { instance.set_keyboard_server_port(calc_vsock_port(7000)); |