Commit 3d0476a8 authored by Scott Graham's avatar Scott Graham

Roll Fuchsia SDK to 893404234442cf13abbc4e22ed996839ff5b1338

Updates clang toolchain_libs path to 7.0.0.

Includes https://fuchsia-review.googlesource.com/c/zircon/+/115121
which should fix component builds crashes.

Also renames calls from zx_time_get() to zx_clock_get() per recent
Fuchsia syscall change.

TBR=kmackay@chromium.org

Bug: 724204, 707030, 803110
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: If2cb1d320c27b60fb32b0337ce1c6d2886b45b33
Reviewed-on: https://chromium-review.googlesource.com/884822Reviewed-by: default avatarKenneth MacKay <kmackay@chromium.org>
Reviewed-by: default avatarWez <wez@chromium.org>
Commit-Queue: Scott Graham <scottmg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532014}
parent d55aad50
...@@ -1345,7 +1345,7 @@ hooks = [ ...@@ -1345,7 +1345,7 @@ hooks = [
'action': [ 'action': [
'python', 'python',
'src/build/fuchsia/update_sdk.py', 'src/build/fuchsia/update_sdk.py',
'8a3a2690f5840f50237a9b71523e9f8dad79d769', '893404234442cf13abbc4e22ed996839ff5b1338',
], ],
}, },
......
...@@ -28,7 +28,7 @@ ALWAYS_INLINE int64_t ZxTimeToMicroseconds(zx_time_t nanos) { ...@@ -28,7 +28,7 @@ ALWAYS_INLINE int64_t ZxTimeToMicroseconds(zx_time_t nanos) {
namespace subtle { namespace subtle {
Time TimeNowIgnoringOverride() { Time TimeNowIgnoringOverride() {
const zx_time_t nanos_since_unix_epoch = zx_time_get(ZX_CLOCK_UTC); const zx_time_t nanos_since_unix_epoch = zx_clock_get(ZX_CLOCK_UTC);
CHECK(nanos_since_unix_epoch != 0); CHECK(nanos_since_unix_epoch != 0);
// The following expression will overflow in the year 289938 A.D.: // The following expression will overflow in the year 289938 A.D.:
return Time() + TimeDelta::FromMicroseconds( return Time() + TimeDelta::FromMicroseconds(
...@@ -46,7 +46,7 @@ Time TimeNowFromSystemTimeIgnoringOverride() { ...@@ -46,7 +46,7 @@ Time TimeNowFromSystemTimeIgnoringOverride() {
namespace subtle { namespace subtle {
TimeTicks TimeTicksNowIgnoringOverride() { TimeTicks TimeTicksNowIgnoringOverride() {
const zx_time_t nanos_since_boot = zx_time_get(ZX_CLOCK_MONOTONIC); const zx_time_t nanos_since_boot = zx_clock_get(ZX_CLOCK_MONOTONIC);
CHECK(nanos_since_boot != 0); CHECK(nanos_since_boot != 0);
return TimeTicks() + return TimeTicks() +
TimeDelta::FromMicroseconds(ZxTimeToMicroseconds(nanos_since_boot)); TimeDelta::FromMicroseconds(ZxTimeToMicroseconds(nanos_since_boot));
...@@ -83,7 +83,7 @@ zx_time_t TimeTicks::ToZxTime() const { ...@@ -83,7 +83,7 @@ zx_time_t TimeTicks::ToZxTime() const {
namespace subtle { namespace subtle {
ThreadTicks ThreadTicksNowIgnoringOverride() { ThreadTicks ThreadTicksNowIgnoringOverride() {
const zx_time_t nanos_since_thread_started = zx_time_get(ZX_CLOCK_THREAD); const zx_time_t nanos_since_thread_started = zx_clock_get(ZX_CLOCK_THREAD);
CHECK(nanos_since_thread_started != 0); CHECK(nanos_since_thread_started != 0);
return ThreadTicks() + TimeDelta::FromMicroseconds( return ThreadTicks() + TimeDelta::FromMicroseconds(
ZxTimeToMicroseconds(nanos_since_thread_started)); ZxTimeToMicroseconds(nanos_since_thread_started));
......
...@@ -33,11 +33,11 @@ config("compiler") { ...@@ -33,11 +33,11 @@ config("compiler") {
# patches, we might want to make tools/clang/scripts/update.py build it # patches, we might want to make tools/clang/scripts/update.py build it
# and bundle it with the clang package instead of using the library from # and bundle it with the clang package instead of using the library from
# the SDK, https://crbug.com/724204 # the SDK, https://crbug.com/724204
# Note: Intentionally 6.0.0 instead of $clang_version because the clang # Note: Intentionally 7.0.0 instead of $clang_version because the clang
# version of the toolchain_libs directory in the Fuchsia SDK can be # version of the toolchain_libs directory in the Fuchsia SDK can be
# different from the version of Chromium's clang. # different from the version of Chromium's clang.
"-resource-dir", "-resource-dir",
rebase_path(fuchsia_sdk, root_build_dir) + "/toolchain_libs/clang/6.0.0", rebase_path(fuchsia_sdk, root_build_dir) + "/toolchain_libs/clang/7.0.0",
# The stack defaults to 256k on Fuchsia (see # The stack defaults to 256k on Fuchsia (see
# https://fuchsia.googlesource.com/zircon/+/master/system/private/zircon/stack.h#9), # https://fuchsia.googlesource.com/zircon/+/master/system/private/zircon/stack.h#9),
......
...@@ -76,7 +76,7 @@ int64_t MonotonicClockNow() { ...@@ -76,7 +76,7 @@ int64_t MonotonicClockNow() {
} }
#else #else
int64_t MonotonicClockNow() { int64_t MonotonicClockNow() {
return zx_time_get(ZX_CLOCK_MONOTONIC) / 1000; return zx_clock_get(ZX_CLOCK_MONOTONIC) / 1000;
} }
#endif #endif
......
...@@ -117,8 +117,8 @@ bool MixerOutputStreamFuchsia::Write(const float* data, ...@@ -117,8 +117,8 @@ bool MixerOutputStreamFuchsia::Write(const float* data,
// Presentation time (PTS) needs to be specified only for the first frame // Presentation time (PTS) needs to be specified only for the first frame
// after stream is started or restarted. Mixer will calculate PTS for all // after stream is started or restarted. Mixer will calculate PTS for all
// following frames. 1us is added to account for the time passed between // following frames. 1us is added to account for the time passed between
// zx_time_get() and fuchsia_audio_output_stream_write(). // zx_clock_get() and fuchsia_audio_output_stream_write().
zx_time_t zx_now = zx_time_get(ZX_CLOCK_MONOTONIC); zx_time_t zx_now = zx_clock_get(ZX_CLOCK_MONOTONIC);
presentation_time = zx_now + presentation_delay_ns_ + ZX_USEC(1); presentation_time = zx_now + presentation_delay_ns_ + ZX_USEC(1);
started_time_ = base::TimeTicks::FromZxTime(zx_now); started_time_ = base::TimeTicks::FromZxTime(zx_now);
stream_position_samples_ = 0; stream_position_samples_ = 0;
......
...@@ -137,8 +137,8 @@ void AudioOutputStreamFuchsia::PumpSamples() { ...@@ -137,8 +137,8 @@ void AudioOutputStreamFuchsia::PumpSamples() {
// Presentation time (PTS) needs to be specified only for the first frame // Presentation time (PTS) needs to be specified only for the first frame
// after stream is started or restarted. Mixer will calculate PTS for all // after stream is started or restarted. Mixer will calculate PTS for all
// following frames. 1us is added to account for the time passed between // following frames. 1us is added to account for the time passed between
// zx_time_get() and fuchsia_audio_output_stream_write(). // zx_clock_get() and fuchsia_audio_output_stream_write().
zx_time_t zx_now = zx_time_get(ZX_CLOCK_MONOTONIC); zx_time_t zx_now = zx_clock_get(ZX_CLOCK_MONOTONIC);
presentation_time = zx_now + presentation_delay_ns_ + ZX_USEC(1); presentation_time = zx_now + presentation_delay_ns_ + ZX_USEC(1);
started_time_ = base::TimeTicks::FromZxTime(zx_now); started_time_ = base::TimeTicks::FromZxTime(zx_now);
stream_position_samples_ = 0; stream_position_samples_ = 0;
......
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