Upgrade to tzcode2013d.
Well, kinda... localtime.c still contains a bunch of Android-specific
hacks, as does strftime.c. But the other files are now exactly the same
as upstream.
This catches up with several years of bug fixes, and fixes most of the
compiler warnings that were in this code. (Just two remain.)
Bug: 1744909
Change-Id: I2ddfecb6fd408c847397c17afb0fff859e27feef
diff --git a/libc/Android.mk b/libc/Android.mk
index 16b24de..0e93acd 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -70,11 +70,6 @@
string/strtok.c \
wchar/wcswidth.c \
wchar/wcsxfrm.c \
- tzcode/asctime.c \
- tzcode/difftime.c \
- tzcode/localtime.c \
- tzcode/strftime.c \
- tzcode/strptime.c \
bionic/arc4random.c \
bionic/atoi.c \
bionic/atol.c \
@@ -247,6 +242,13 @@
bionic/wait.cpp \
bionic/wchar.cpp \
+libc_tzcode_src_files := \
+ tzcode/asctime.c \
+ tzcode/difftime.c \
+ tzcode/localtime.c \
+ tzcode/strftime.c \
+ tzcode/strptime.c \
+
libc_upstream_freebsd_src_files := \
upstream-freebsd/lib/libc/stdio/clrerr.c \
upstream-freebsd/lib/libc/stdio/fclose.c \
@@ -490,14 +492,6 @@
-DLOG_ON_HEAP_ERROR \
-Wall -Wextra
-# these macro definitions are required to implement the
-# 'timezone' and 'daylight' global variables, as well as
-# properly update the 'tm_gmtoff' field in 'struct tm'.
-#
-libc_common_cflags += \
- -DTM_GMTOFF=tm_gmtoff \
- -DUSG_COMPAT=1
-
ifeq ($(strip $(DEBUG_BIONIC_LIBC)),true)
libc_common_cflags += -DDEBUG
endif
@@ -708,6 +702,28 @@
# ========================================================
+# libc_tzcode.a - upstream 'tzcode' code
+# ========================================================
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(libc_tzcode_src_files)
+LOCAL_CFLAGS := \
+ $(libc_common_cflags) \
+ -std=gnu99 \
+ -DSTD_INSPIRED=1 \
+ -DTZDIR=\"/system/usr/share/zoneinfo\" \
+ -DTM_GMTOFF=tm_gmtoff \
+ -DUSG_COMPAT=1
+LOCAL_C_INCLUDES := $(libc_common_c_includes)
+LOCAL_MODULE := libc_tzcode
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_SYSTEM_SHARED_LIBRARIES :=
+
+include $(BUILD_STATIC_LIBRARY)
+
+
+# ========================================================
# libc_freebsd.a - upstream FreeBSD C library code
# ========================================================
#
@@ -782,7 +798,12 @@
LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_MODULE := libc_common
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_WHOLE_STATIC_LIBRARIES := libbionic_ssp libc_bionic libc_freebsd libc_netbsd
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+ libbionic_ssp \
+ libc_bionic \
+ libc_freebsd \
+ libc_netbsd \
+ libc_tzcode
LOCAL_SYSTEM_SHARED_LIBRARIES :=
include $(BUILD_STATIC_LIBRARY)