Merge "Addition of a new system file for time zone data"
This commit is contained in:
commit
d90713b335
2 changed files with 1642 additions and 0 deletions
|
@ -9,6 +9,15 @@ LOCAL_MODULE_TAGS := optional
|
|||
LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/zoneinfo
|
||||
include $(BUILD_PREBUILT)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := tzlookup.xml
|
||||
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)
|
||||
|
||||
|
@ -23,4 +32,15 @@ LOCAL_MODULE_STEM := $(LOCAL_SRC_FILES)
|
|||
LOCAL_MODULE_PATH := $(HOST_OUT)/usr/share/zoneinfo
|
||||
include $(BUILD_PREBUILT)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := tzlookup.xml-host
|
||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
||||
LOCAL_IS_HOST_MODULE := true
|
||||
LOCAL_SRC_FILES := tzlookup.xml
|
||||
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
|
||||
|
|
1622
libc/zoneinfo/tzlookup.xml
Normal file
1622
libc/zoneinfo/tzlookup.xml
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue