commit dc4c1f7dd9386ec10251579e8fa3fe55587aec41
author Almaz Mingaleev <mingaleev@google.com> Thu Jun 09 10:44:06 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 09 10:44:06 2022 +0000
tree aa0884666bd90a31b90449e2f4ccd89788f2b739
parent 7902bfcf9de50de49911d0ef6df43c7edc92fa06
parent 94657009839a4918337ac069652085906e3ee322

Merge "Set TZDEFAULT to NULL." am: 9465700983

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2101267

Change-Id: I7a0ee6a032366d01f0f14d7adef40b6bd9a2ebbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index c8df591..3ee7c0a 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -262,6 +262,8 @@
         "-DTHREAD_SAFE=1",
         // The name of the tm_gmtoff field in our struct tm.
         "-DTM_GMTOFF=tm_gmtoff",
+        // TZDEFAULT is not applicable to Android as there is no one file per time zone mapping
+        "-DTZDEFAULT=NULL",
         // Where we store our tzdata.
         "-DTZDIR=\"/system/usr/share/zoneinfo\"",
         // Include `tzname`, `timezone`, and `daylight` globals.