aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2010-08-31 13:16:25 -0700
committerJesse Wilson <jessewilson@google.com>2010-08-31 13:16:25 -0700
commite77d54d98a430a5f80d3bd5569f3b32866e4c538 (patch)
tree2b1441f41122d6442fc160f3b7c0a8d0fd7bac30
parent22f1e3d4fae7d45cc439da94690d786ed44756fb (diff)
downloadandroid_bionic-e77d54d98a430a5f80d3bd5569f3b32866e4c538.tar.gz
android_bionic-e77d54d98a430a5f80d3bd5569f3b32866e4c538.tar.bz2
android_bionic-e77d54d98a430a5f80d3bd5569f3b32866e4c538.zip
Make timezones available to the host build.
Change-Id: Ib2c89ac13b03f07c6c712a544bc0d5d1c9dc57df
-rw-r--r--libc/zoneinfo/Android.mk12
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