diff options
| author | Ying Wang <wangying@google.com> | 2012-07-26 15:55:18 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-07-27 13:44:01 -0700 |
| commit | 6171d11e72b114550273a05d35a7d67534f6dabb (patch) | |
| tree | 97dba45b177bc8ed8bea209369de90c885195248 /libc/zoneinfo | |
| parent | 12f411d9a696ca7a0fe490fb530a9accbda66a99 (diff) | |
| download | bionic-6171d11e72b114550273a05d35a7d67534f6dabb.zip bionic-6171d11e72b114550273a05d35a7d67534f6dabb.tar.gz bionic-6171d11e72b114550273a05d35a7d67534f6dabb.tar.bz2 | |
Replace ALL_PREBUILTS with BUILD_PREBUILT
(cherry-picked from 186b36b65bdfbf2c89a661539bf530359364eac9.)
Bug: 6857263
Change-Id: If787d84415dd2ac07105fe0d0b7a27c9be75df64
Diffstat (limited to 'libc/zoneinfo')
| -rw-r--r-- | libc/zoneinfo/Android.mk | 71 |
1 files changed, 56 insertions, 15 deletions
diff --git a/libc/zoneinfo/Android.mk b/libc/zoneinfo/Android.mk index ef700e8..716aab2 100644 --- a/libc/zoneinfo/Android.mk +++ b/libc/zoneinfo/Android.mk @@ -1,26 +1,67 @@ LOCAL_PATH:= $(call my-dir) + +############################################ include $(CLEAR_VARS) +LOCAL_MODULE := zoneinfo.dat +LOCAL_SRC_FILES := $(LOCAL_MODULE) +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/zoneinfo +include $(BUILD_PREBUILT) -ALL_PREBUILT += $(TARGET_OUT)/usr/share/zoneinfo/zoneinfo.dat -$(TARGET_OUT)/usr/share/zoneinfo/zoneinfo.dat : $(LOCAL_PATH)/zoneinfo.dat | $(ACP) - $(transform-prebuilt-to-target) +############################################ +include $(CLEAR_VARS) +LOCAL_MODULE := zoneinfo.idx +LOCAL_SRC_FILES := $(LOCAL_MODULE) +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/zoneinfo +include $(BUILD_PREBUILT) -ALL_PREBUILT += $(TARGET_OUT)/usr/share/zoneinfo/zoneinfo.idx -$(TARGET_OUT)/usr/share/zoneinfo/zoneinfo.idx : $(LOCAL_PATH)/zoneinfo.idx | $(ACP) - $(transform-prebuilt-to-target) +############################################ +include $(CLEAR_VARS) +LOCAL_MODULE := zoneinfo.version +LOCAL_SRC_FILES := $(LOCAL_MODULE) +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/zoneinfo +include $(BUILD_PREBUILT) -ALL_PREBUILT += $(TARGET_OUT)/usr/share/zoneinfo/zoneinfo.version -$(TARGET_OUT)/usr/share/zoneinfo/zoneinfo.version : $(LOCAL_PATH)/zoneinfo.version | $(ACP) - $(transform-prebuilt-to-target) # The host build doesn't use bionic, but it does use bionic's zoneinfo data ifeq ($(WITH_HOST_DALVIK),true) - ALL_PREBUILT += $(HOST_OUT)/usr/share/zoneinfo/zoneinfo.dat - $(eval $(call copy-one-file,$(LOCAL_PATH)/zoneinfo.dat,$(HOST_OUT)/usr/share/zoneinfo/zoneinfo.dat)) - ALL_PREBUILT += $(HOST_OUT)/usr/share/zoneinfo/zoneinfo.idx - $(eval $(call copy-one-file,$(LOCAL_PATH)/zoneinfo.idx,$(HOST_OUT)/usr/share/zoneinfo/zoneinfo.idx)) +############################################ +include $(CLEAR_VARS) +LOCAL_MODULE := zoneinfo-host.dat +LOCAL_IS_HOST_MODULE := true +LOCAL_SRC_FILES := zoneinfo.dat +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) + +############################################ +include $(CLEAR_VARS) +LOCAL_MODULE := zoneinfo-host.idx +LOCAL_IS_HOST_MODULE := true +LOCAL_SRC_FILES := zoneinfo.idx +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) + +############################################ +include $(CLEAR_VARS) +LOCAL_MODULE := zoneinfo-host.version +LOCAL_IS_HOST_MODULE := true +LOCAL_SRC_FILES := zoneinfo.version +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) - ALL_PREBUILT += $(HOST_OUT)/usr/share/zoneinfo/zoneinfo.version - $(eval $(call copy-one-file,$(LOCAL_PATH)/zoneinfo.version,$(HOST_OUT)/usr/share/zoneinfo/zoneinfo.version)) endif |