Merge "[clang] Fix missing header after libc++ update" into main
diff --git a/android-emu/aemu/base/fit/Nullable.h b/android-emu/aemu/base/fit/Nullable.h
index e05021b..6d4c060 100644
--- a/android-emu/aemu/base/fit/Nullable.h
+++ b/android-emu/aemu/base/fit/Nullable.h
@@ -72,7 +72,7 @@
// - sizeof(fit::nullable<int>) == sizeof(struct { bool; int; })
// - sizeof(std::optional<int>) == sizeof(struct { bool; int; })
//
-// TODO(fxbug.dev/4681): fit::nullable does not precisely mirror
+// TODO(fxbug.dev/42123486): fit::nullable does not precisely mirror
// std::optional. This should be corrected to avoid surprises when switching
// between the types.
template <typename T,
diff --git a/shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl b/shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl
index bf03f70..db216f0 100644
--- a/shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl
+++ b/shared/GoldfishAddressSpace/include/goldfish_address_space_fuchsia.impl
@@ -133,7 +133,7 @@
return false;
}
m_phys_addr = result->paddr;
- // TODO(fxbug.dev/124700): Instead of storing raw handles we should
+ // TODO(fxbug.dev/42075554): Instead of storing raw handles we should
// consider using RAII zx::object instead.
m_vmo = result->vmo.release();
@@ -363,7 +363,7 @@
*offset = 0;
- // TODO(fxbug.dev/124700): Instead of storing raw handles we should
+ // TODO(fxbug.dev/42075554): Instead of storing raw handles we should
// consider using RAII zx::object instead.
VmoStore::Info info = {
vmo.release(),
@@ -408,7 +408,7 @@
}
vmo = std::move(result->vmo);
- // TODO(fxbug.dev/124700): Instead of storing raw handles we should
+ // TODO(fxbug.dev/42075554): Instead of storing raw handles we should
// consider using RAII zx::object instead.
VmoStore::Info info = {
vmo.release(),
diff --git a/system/magma/magma.cpp b/system/magma/magma.cpp
index 65a5a6c..69e356c 100644
--- a/system/magma/magma.cpp
+++ b/system/magma/magma.cpp
@@ -134,7 +134,7 @@
return MAGMA_STATUS_INVALID_ARGS;
}
- // TODO(fxbug.dev/122604): Evaluate deferred guest resource creation.
+ // TODO(fxbug.dev/42073573): Evaluate deferred guest resource creation.
auto blob = VirtGpuDevice::getInstance(VirtGpuCapset::kCapsetGfxStream)
.createBlob({.size = size,
.flags = kBlobFlagMappable | kBlobFlagShareable,
diff --git a/system/magma/magma_enc/magma_enc.cpp b/system/magma/magma_enc/magma_enc.cpp
index 153d708..3e764de 100644
--- a/system/magma/magma_enc/magma_enc.cpp
+++ b/system/magma/magma_enc/magma_enc.cpp
@@ -12,7 +12,7 @@
#include <stdio.h>
-// TODO(fxbug.dev/122605): Why is modification needed for these two includes?
+// TODO(fxbug.dev/42073574): Why is modification needed for these two includes?
#include "aemu/base/Tracing.h"
#include "cutils/log.h"
diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 2b4096e..1fe25d2 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -1796,7 +1796,7 @@
// Importing read-only host memory into the Vulkan driver should not
// work, but it is not an error to try to do so. Returning a
// VkMemoryZirconHandlePropertiesFUCHSIA with no available
- // memoryType bits should be enough for clients. See fxbug.dev/24225
+ // memoryType bits should be enough for clients. See fxbug.dev/42098398
// for other issues this this flow.
ALOGW("GetBufferHandleInfo failed: %d", result.value().error_value());
pProperties->memoryTypeBits = 0;
@@ -2171,7 +2171,7 @@
}
}
- // TODO(fxbug.dev/90856): This is currently only used for allocating
+ // TODO(fxbug.dev/42172354): This is currently only used for allocating
// memory for dedicated external images. It should be migrated to use
// SetBufferCollectionImageConstraintsFUCHSIA.
VkResult setBufferCollectionConstraintsFUCHSIA(
@@ -2465,7 +2465,7 @@
ALOGW(
"%s: Non-zero flags (%08x) in image format "
"constraints; this is currently not supported, see "
- "fxbug.dev/68833.",
+ "fxbug.dev/42147900.",
__func__, formatConstraints->flags);
}
}
@@ -3502,7 +3502,7 @@
fidl::WireSyncClient<fuchsia_sysmem::BufferCollection> collection(
std::move(collection_ends->client));
if (hasDedicatedImage) {
- // TODO(fxbug.dev/90856): Use setBufferCollectionImageConstraintsFUCHSIA.
+ // TODO(fxbug.dev/42172354): Use setBufferCollectionImageConstraintsFUCHSIA.
VkResult res = setBufferCollectionConstraintsFUCHSIA(
enc, device, &collection, pImageCreateInfo);
if (res == VK_ERROR_FORMAT_NOT_SUPPORTED) {
@@ -5799,7 +5799,7 @@
{semInfo.eventHandle, semInfo.eventKoid});
#ifndef FUCHSIA_NO_TRACE
if (semInfo.eventKoid != ZX_KOID_INVALID) {
- // TODO(fxbug.dev/66098): Remove the "semaphore"
+ // TODO(fxbug.dev/42144867): Remove the "semaphore"
// FLOW_END events once it is removed from clients
// (for example, gfx Engine).
TRACE_FLOW_END("gfx", "semaphore",
diff --git a/third-party/fuchsia/README b/third-party/fuchsia/README
index e315413..e012b39 100644
--- a/third-party/fuchsia/README
+++ b/third-party/fuchsia/README
@@ -1 +1 @@
-These files come from fuchsia.googlesource.com. Once Magma is in the Fuchsia SDK (https://fxbug.dev/116007, https://fxbug.dev/111471), these files should be removed and the Fuchsia SDK added as a proper dependency (https://fxbug.dev/122678).
+These files come from fuchsia.googlesource.com. Once Magma is in the Fuchsia SDK (https://fxbug.dev/42067270, https://fxbug.dev/42062806), these files should be removed and the Fuchsia SDK added as a proper dependency (https://fxbug.dev/42073654).
