Commit 3d18716c authored by Sergey Ulanov's avatar Sergey Ulanov Committed by Commit Bot

Roll Fuchsia SDK from e237df60615b to c9b6deebf8ef.

This is a manual roll to bring us to the most-recent working SDK build.

CQ_INCLUDE_TRYBOTS=luci.chromium.try:fuchsia_arm64_cast_audio;luci.chromium.try:fuchsia_x64_cast_audio


Change-Id: I1c614558bc5b3f2376537455d42fb705e5ce3dee
Reviewed-on: https://chromium-review.googlesource.com/1141929Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Reviewed-by: default avatarDavid Benjamin <davidben@chromium.org>
Reviewed-by: default avatarSergey Ulanov <sergeyu@chromium.org>
Reviewed-by: default avatarWez <wez@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576199}
parent 3f76e15e
...@@ -16,7 +16,13 @@ namespace base { ...@@ -16,7 +16,13 @@ namespace base {
namespace { namespace {
// PATH env variable is not set on Fuchsia by default, while PWD is not set on
// Windows.
#if defined(OS_FUCHSIA)
constexpr char kValidEnvironmentVariable[] = "PWD";
#else
constexpr char kValidEnvironmentVariable[] = "PATH"; constexpr char kValidEnvironmentVariable[] = "PATH";
#endif
} // namespace } // namespace
......
e237df60615b92cc90bdcd1aa3007d2cc83dc35c c9b6deebf8ef0d85134dfee4806f1a7bc2df3193
\ No newline at end of file
...@@ -153,7 +153,7 @@ class FakeNetstack : public fuchsia::netstack::Netstack { ...@@ -153,7 +153,7 @@ class FakeNetstack : public fuchsia::netstack::Netstack {
::fidl::VectorPtr<fuchsia::netstack::RouteTableEntry> rt) override {} ::fidl::VectorPtr<fuchsia::netstack::RouteTableEntry> rt) override {}
void SetInterfaceAddress(uint32_t nicid, void SetInterfaceAddress(uint32_t nicid,
fuchsia::netstack::NetAddress addr, fuchsia::netstack::NetAddress addr,
uint64_t prefixLen, uint8_t prefixLen,
SetInterfaceAddressCallback callback) override {} SetInterfaceAddressCallback callback) override {}
void SetDhcpClientStatus(uint32_t nicid, void SetDhcpClientStatus(uint32_t nicid,
bool enabled, bool enabled,
......
...@@ -58,13 +58,13 @@ fuchsia::fonts::FontSlant ToFontSlant(SkFontStyle::Slant slant) { ...@@ -58,13 +58,13 @@ fuchsia::fonts::FontSlant ToFontSlant(SkFontStyle::Slant slant) {
void UnmapMemory(const void* buffer, void* context) { void UnmapMemory(const void* buffer, void* context) {
const uintptr_t size = reinterpret_cast<uintptr_t>(context); const uintptr_t size = reinterpret_cast<uintptr_t>(context);
zx::vmar::root_self().unmap(reinterpret_cast<uintptr_t>(buffer), size); zx::vmar::root_self()->unmap(reinterpret_cast<uintptr_t>(buffer), size);
} }
sk_sp<SkData> BufferToSkData(fuchsia::mem::Buffer data) { sk_sp<SkData> BufferToSkData(fuchsia::mem::Buffer data) {
uintptr_t buffer = 0; uintptr_t buffer = 0;
zx_status_t status = zx::vmar::root_self().map(0, data.vmo, 0, data.size, zx_status_t status = zx::vmar::root_self()->map(
ZX_VM_FLAG_PERM_READ, &buffer); 0, data.vmo, 0, data.size, ZX_VM_FLAG_PERM_READ, &buffer);
if (status != ZX_OK) { if (status != ZX_OK) {
ZX_DLOG(ERROR, status) << "zx_vmar_map"; ZX_DLOG(ERROR, status) << "zx_vmar_map";
return nullptr; return nullptr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment