diff options
| author | Elliott Hughes <enh@google.com> | 2012-10-17 14:24:50 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-10-17 14:24:50 -0700 |
| commit | fb018a2ddea0513756b4e097d59c3df91a8e5946 (patch) | |
| tree | bda7af38b1903d353df62adbf184641f1c6a9cde /libc/zoneinfo | |
| parent | a2f596b65075db7916ffffa2f5059e7953719578 (diff) | |
| download | bionic-fb018a2ddea0513756b4e097d59c3df91a8e5946.zip bionic-fb018a2ddea0513756b4e097d59c3df91a8e5946.tar.gz bionic-fb018a2ddea0513756b4e097d59c3df91a8e5946.tar.bz2 | |
Put all the tzdata in one file.
I'll come back and remove the separate files (and change the regular 'generate'
script) when the separate files are obsolete, but in the interim period, it's
easier to have both old and new files available.
Bug: 7012465
Change-Id: I36e2fd49c08ff79ded6eca1c5bc4c08837cc490a
Diffstat (limited to 'libc/zoneinfo')
| -rw-r--r-- | libc/zoneinfo/Android.mk | 21 | ||||
| -rw-r--r-- | libc/zoneinfo/tzdata | bin | 0 -> 521426 bytes |
2 files changed, 21 insertions, 0 deletions
diff --git a/libc/zoneinfo/Android.mk b/libc/zoneinfo/Android.mk index 7cd9139..e3bc8ea 100644 --- a/libc/zoneinfo/Android.mk +++ b/libc/zoneinfo/Android.mk @@ -30,6 +30,15 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/zoneinfo include $(BUILD_PREBUILT) +############################################ +include $(CLEAR_VARS) +LOCAL_MODULE := tzdata +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_SRC_FILES := $(LOCAL_MODULE) +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/zoneinfo +include $(BUILD_PREBUILT) # The host build doesn't use bionic, but it does use bionic's zoneinfo data ifeq ($(WITH_HOST_DALVIK),true) @@ -70,4 +79,16 @@ LOCAL_MODULE_STEM := $(LOCAL_SRC_FILES) LOCAL_MODULE_PATH := $(HOST_OUT)/usr/share/zoneinfo include $(BUILD_PREBUILT) +############################################ +include $(CLEAR_VARS) +LOCAL_MODULE := tzdata-host +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_IS_HOST_MODULE := true +LOCAL_SRC_FILES := tzdata +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_STEM := $(LOCAL_SRC_FILES) +LOCAL_MODULE_PATH := $(HOST_OUT)/usr/share/zoneinfo +include $(BUILD_PREBUILT) + endif diff --git a/libc/zoneinfo/tzdata b/libc/zoneinfo/tzdata Binary files differnew file mode 100644 index 0000000..3529c8b --- /dev/null +++ b/libc/zoneinfo/tzdata |