Skip to content

Commit d9b069b

Browse files
filmilcommit-bot@chromium.org
authored andcommitted
[vm] Use fuchsia.deprecatedtimezone
This sets us up for migrating away from a dedicated timezone service into a more general `fuchsia.intl.*`. As a first step, let's use only one of the two equivalent FIDL service sets. In fuchsia they are implemented by exactly the same handlers, so are equivalent to the best of my knowledge. Fixes #39174. Change-Id: I229670bb96816af808a0cb14e6d2cba283f9ef62 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/123487 Reviewed-by: Ryan Macnak <rmacnak@google.com> Commit-Queue: Ryan Macnak <rmacnak@google.com>
1 parent 5509851 commit d9b069b

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

runtime/vm/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ library_for_all_configs("libdart_vm") {
7979
# TODO(US-399): Remove time_service specific code when it is no longer
8080
# necessary.
8181
"//sdk/lib/sys/cpp",
82-
"//sdk/fidl/fuchsia.timezone",
82+
"//sdk/fidl/fuchsia.deprecatedtimezone",
8383

8484
"//zircon/public/lib/fbl",
8585
"//zircon/public/lib/trace-engine",

runtime/vm/os_fuchsia.cc

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,7 @@
88
#include "vm/os.h"
99

1010
#include <errno.h>
11-
#if defined(FUCHSIA_SDK)
1211
#include <fuchsia/deprecatedtimezone/cpp/fidl.h>
13-
namespace fuchsia {
14-
namespace timezone = deprecatedtimezone;
15-
}
16-
#else
17-
#include <fuchsia/timezone/cpp/fidl.h>
18-
#endif // defined(FUCHSIA_SDK)
1912
#include <lib/sys/cpp/service_directory.h>
2013
#include <zircon/process.h>
2114
#include <zircon/syscalls.h>
@@ -50,7 +43,7 @@ intptr_t OS::ProcessId() {
5043
// Putting this hack right now due to CP-120 as I need to remove
5144
// component:ConnectToEnvironmentServices and this is the only thing that is
5245
// blocking it and FL-98 will take time.
53-
static fuchsia::timezone::TimezoneSyncPtr tz;
46+
static fuchsia::deprecatedtimezone::TimezoneSyncPtr tz;
5447

5548
static zx_status_t GetLocalAndDstOffsetInSeconds(int64_t seconds_since_epoch,
5649
int32_t* local_offset,

0 commit comments

Comments
 (0)