Sync strptime.c with upstream.
We still have local differences, but this minimizes (and documents) them.
Bug: http://b/167569813
Test: treehugger
Change-Id: Ib90e6ccc5ec1224e7ee89224a51b87fc48c9931f
diff --git a/libc/Android.bp b/libc/Android.bp
index cd53906..5732490 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -251,7 +251,10 @@
srcs: [
"tzcode/**/*.c",
"tzcode/bionic.cpp",
- "upstream-openbsd/lib/libc/time/wcsftime.c", // tzcode doesn't include wcsftime, so we use the OpenBSD one.
+ // tzcode doesn't include strptime or wcsftime, so we use the OpenBSD
+ // code (with some local changes in the strptime case).
+ "upstream-openbsd/lib/libc/locale/_def_time.c",
+ "upstream-openbsd/lib/libc/time/wcsftime.c",
],
cflags: [
@@ -1189,6 +1192,7 @@
"bionic/termios.cpp",
"bionic/thread_private.cpp",
"bionic/threads.cpp",
+ "bionic/time_l.cpp",
"bionic/timespec_get.cpp",
"bionic/tmpfile.cpp",
"bionic/umount.cpp",