diff options
| author | Elliott Hughes <enh@google.com> | 2014-04-26 04:51:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-26 04:51:55 +0000 |
| commit | 3ac3f3fd0cab7b4ace8e15fd90ea869b26449df5 (patch) | |
| tree | 0624fa58c29f43ffe405be7fa47a73f85ad29fae /libc/Android.mk | |
| parent | f2dc7d17196de9904df67f21aad1525b8568a705 (diff) | |
| parent | 329103d3e2f42d3e35a060c3e0d326d6476eb2ef (diff) | |
| download | android_bionic-3ac3f3fd0cab7b4ace8e15fd90ea869b26449df5.tar.gz android_bionic-3ac3f3fd0cab7b4ace8e15fd90ea869b26449df5.tar.bz2 android_bionic-3ac3f3fd0cab7b4ace8e15fd90ea869b26449df5.zip | |
Merge "Don't use so much stack in tzcode."
Diffstat (limited to 'libc/Android.mk')
| -rw-r--r-- | libc/Android.mk | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 2ea7f1fdb..5cadba169 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -511,12 +511,19 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-c-files-under,tzcode) -LOCAL_CFLAGS := \ - $(libc_common_cflags) \ - -DSTD_INSPIRED=1 \ - -DTZDIR=\"/system/usr/share/zoneinfo\" \ - -DTM_GMTOFF=tm_gmtoff \ - -DUSG_COMPAT=1 + +LOCAL_CFLAGS := $(libc_common_cflags) +# Don't use ridiculous amounts of stack. +LOCAL_CFLAGS += -DALL_STATE +# Include tzsetwall, timelocal, timegm, time2posix, and posix2time. +LOCAL_CFLAGS += -DSTD_INSPIRED +# The name of the tm_gmtoff field in our struct tm. +LOCAL_CFLAGS += -DTM_GMTOFF=tm_gmtoff +# Where we store our tzdata. +LOCAL_CFLAGS += -DTZDIR=\"/system/usr/share/zoneinfo\" +# Include timezone and daylight globals. +LOCAL_CFLAGS += -DUSG_COMPAT=1 + LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CPPFLAGS := $(libc_common_cppflags) LOCAL_C_INCLUDES := $(libc_common_c_includes) |