diff options
| author | Elliott Hughes <enh@google.com> | 2013-08-22 14:32:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-22 14:32:44 -0700 |
| commit | 2d38fced00a873da8077a5193b2d5ef8603dcc66 (patch) | |
| tree | f24fc6b2f370790941d0b0e04ff443571c8727cb /libc/Android.mk | |
| parent | 5cf93f8d91be8e7e1654d7eee5966d6da5d6fe85 (diff) | |
| parent | 7003a14b536bad08476d2f2005ebcc0490b77b24 (diff) | |
| download | bionic-2d38fced00a873da8077a5193b2d5ef8603dcc66.zip bionic-2d38fced00a873da8077a5193b2d5ef8603dcc66.tar.gz bionic-2d38fced00a873da8077a5193b2d5ef8603dcc66.tar.bz2 | |
am 7003a14b: am 41f08abf: Merge "Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a."
* commit '7003a14b536bad08476d2f2005ebcc0490b77b24':
Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
Diffstat (limited to 'libc/Android.mk')
| -rw-r--r-- | libc/Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index cc2e0e9..9610c14 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -718,8 +718,6 @@ LOCAL_CFLAGS := \ -DTZDIR=\"/system/usr/share/zoneinfo\" \ -DTM_GMTOFF=tm_gmtoff \ -DUSG_COMPAT=1 -# tzcode currently relies on signed overflow in numerous places (http://b/10310929). -LOCAL_CFLAGS += -fno-strict-overflow LOCAL_C_INCLUDES := $(libc_common_c_includes) LOCAL_MODULE := libc_tzcode LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk |