diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-28 21:48:31 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-28 21:48:31 +0000 |
commit | e37f46ed35f1e606082fe66ee8a1c86c89579cb5 (patch) | |
tree | be316c14eb9ed549acfd5672cdb7a46e621fd2d1 | |
parent | 1eb632923f403105ecbaa61bcb5abefa3b283898 (diff) | |
parent | 27d49a355d73a4ebd4898e5c8d91d837069d21bf (diff) | |
download | chrono-emu-35-1-release.tar.gz |
Snap for 11639370 from 27d49a355d73a4ebd4898e5c8d91d837069d21bf to emu-35-1-releaseemu-35-1-release
Change-Id: I9c65dd19350c986c4e8e03b22501d4d95d1ec403
-rw-r--r-- | Android.bp | 22 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | cargo_embargo.json | 14 | ||||
-rw-r--r-- | patches/no-tzdata.patch | 51 | ||||
-rw-r--r-- | src/offset/local/unix.rs | 8 |
5 files changed, 4 insertions, 93 deletions
@@ -57,25 +57,3 @@ rust_library { product_available: true, vendor_available: true, } - -rust_library_host { - name: "libchrono_clock", - crate_name: "chrono", - cargo_env_compat: true, - cargo_pkg_version: "0.4.34", - srcs: ["src/lib.rs"], - edition: "2021", - features: [ - "alloc", - "clock", - "now", - "serde", - "std", - "winapi", - "windows-targets", - ], - rustlibs: [ - "libnum_traits", - "libserde", - ], -} @@ -88,6 +88,8 @@ __internal_bench = [] alloc = [] clock = [ "winapi", + "iana-time-zone", + "android-tzdata", "now", ] default = [ diff --git a/cargo_embargo.json b/cargo_embargo.json index 736574c..cdd3408 100644 --- a/cargo_embargo.json +++ b/cargo_embargo.json @@ -1,17 +1,5 @@ { "apex_available": ["//apex_available:platform", "com.android.virt"], "features": ["now", "serde", "std"], - "run_cargo": false, - "variants": [ - {}, - { - "features": ["clock", "now", "serde", "std"], - "module_name_overrides": { "libchrono": "libchrono_clock" }, - "package": { - "chrono": { - "device_supported": false - } - } - } - ] + "run_cargo": false } diff --git a/patches/no-tzdata.patch b/patches/no-tzdata.patch deleted file mode 100644 index d4df88d..0000000 --- a/patches/no-tzdata.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index 9f0f82f..535a845 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -88,8 +88,6 @@ __internal_bench = [] - alloc = [] - clock = [ - "winapi", -- "iana-time-zone", -- "android-tzdata", - "now", - ] - default = [ -diff --git a/patches/no-tzdata.patch b/patches/no-tzdata.patch -index 230cf9e..e69de29 100644 ---- a/patches/no-tzdata.patch -+++ b/patches/no-tzdata.patch -@@ -1,13 +0,0 @@ --diff --git a/Cargo.toml b/Cargo.toml --index 9f0f82f..535a845 100644 ----- a/Cargo.toml --+++ b/Cargo.toml --@@ -88,8 +88,6 @@ __internal_bench = [] -- alloc = [] -- clock = [ -- "winapi", --- "iana-time-zone", --- "android-tzdata", -- "now", -- ] -- default = [ -diff --git a/src/offset/local/unix.rs b/src/offset/local/unix.rs -index ce96a6e..ce844cc 100644 ---- a/src/offset/local/unix.rs -+++ b/src/offset/local/unix.rs -@@ -77,8 +77,14 @@ const TZDB_LOCATION: &str = "/usr/share/lib/zoneinfo"; - #[cfg(not(any(target_os = "android", target_os = "aix")))] - const TZDB_LOCATION: &str = "/usr/share/zoneinfo"; - -+// Android patch to avoid iana-time-zone dependency. -+fn get_timezone() -> Result<String, std::io::Error> { -+ let tz_name = std::fs::read_to_string("/etc/timezone")?; -+ Ok(tz_name.trim_end().to_string()) -+} -+ - fn fallback_timezone() -> Option<TimeZone> { -- let tz_name = iana_time_zone::get_timezone().ok()?; -+ let tz_name = get_timezone().ok()?; - #[cfg(not(target_os = "android"))] - let bytes = fs::read(format!("{}/{}", TZDB_LOCATION, tz_name)).ok()?; - #[cfg(target_os = "android")] diff --git a/src/offset/local/unix.rs b/src/offset/local/unix.rs index ce844cc..ce96a6e 100644 --- a/src/offset/local/unix.rs +++ b/src/offset/local/unix.rs @@ -77,14 +77,8 @@ const TZDB_LOCATION: &str = "/usr/share/lib/zoneinfo"; #[cfg(not(any(target_os = "android", target_os = "aix")))] const TZDB_LOCATION: &str = "/usr/share/zoneinfo"; -// Android patch to avoid iana-time-zone dependency. -fn get_timezone() -> Result<String, std::io::Error> { - let tz_name = std::fs::read_to_string("/etc/timezone")?; - Ok(tz_name.trim_end().to_string()) -} - fn fallback_timezone() -> Option<TimeZone> { - let tz_name = get_timezone().ok()?; + let tz_name = iana_time_zone::get_timezone().ok()?; #[cfg(not(target_os = "android"))] let bytes = fs::read(format!("{}/{}", TZDB_LOCATION, tz_name)).ok()?; #[cfg(target_os = "android")] |