diff options
| author | Jesse Wilson <jessewilson@google.com> | 2010-08-31 14:01:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-31 14:01:13 -0700 |
| commit | cc6b18291075a7960ad0d638d2047f41be1297e8 (patch) | |
| tree | 23c76bb8a9c21a5573c049ab03410024dcdea99f | |
| parent | 6a51defa034a1c033ed01f7de444c0a4fc615249 (diff) | |
| parent | e77d54d98a430a5f80d3bd5569f3b32866e4c538 (diff) | |
| download | android_bionic-cc6b18291075a7960ad0d638d2047f41be1297e8.tar.gz android_bionic-cc6b18291075a7960ad0d638d2047f41be1297e8.tar.bz2 android_bionic-cc6b18291075a7960ad0d638d2047f41be1297e8.zip | |
Merge "Make timezones available to the host build." into gingerbread
| -rw-r--r-- | libc/zoneinfo/Android.mk | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libc/zoneinfo/Android.mk b/libc/zoneinfo/Android.mk index 2f36f9be4..ef700e83d 100644 --- a/libc/zoneinfo/Android.mk +++ b/libc/zoneinfo/Android.mk @@ -12,3 +12,15 @@ $(TARGET_OUT)/usr/share/zoneinfo/zoneinfo.idx : $(LOCAL_PATH)/zoneinfo.idx | $(A 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)) + + 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 |