Remove the libchrono_clock variant and local patches.
It isn't needed after all, as netsim have removed their usage of
chrono::Local.
Bug: 326256145
Test: atest libnetsim_common_inline_tests
Change-Id: I2ff034e46b4b1d58c7cb980e2de74ec9dd735ee7
diff --git a/Android.bp b/Android.bp
index ee1d60f..282909e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,25 +57,3 @@
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",
- ],
-}
diff --git a/Cargo.toml b/Cargo.toml
index 535a845..9f0f82f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -88,6 +88,8 @@
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 @@
#[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")]
