Use the prebuilts tzdata apex when building ART.
Test: buildbot-build.sh
Bug: 142935992
Change-Id: I3b3bc90c3035b47cd282f67adc7de5e3c34d9978
diff --git a/Android.mk b/Android.mk
index a46d41d..a7e58a3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -507,8 +507,15 @@
cp -R $(TARGET_OUT)/apex/$(I18N_APEX)/etc/ $(HOST_OUT)/$(I18N_APEX)/
touch $@
+$(HOST_TZDATA_DATA): $(TARGET_OUT)/apex/$(TZDATA_APEX).apex $(HOST_OUT)/bin/deapexer
+ $(call extract-from-apex,$(TZDATA_APEX))
+ rm -rf $(HOST_OUT)/$(TZDATA_APEX)
+ mkdir -p $(HOST_OUT)/$(TZDATA_APEX)/
+ cp -R $(TARGET_OUT)/apex/$(TZDATA_APEX)/etc/ $(HOST_OUT)/$(TZDATA_APEX)/
+ touch $@
+
.PHONY: build-art-host
-build-art-host: $(HOST_OUT_EXECUTABLES)/art $(ART_HOST_DEPENDENCIES) $(HOST_CORE_IMG_OUTS) $(HOST_I18N_DATA)
+build-art-host: $(HOST_OUT_EXECUTABLES)/art $(ART_HOST_DEPENDENCIES) $(HOST_CORE_IMG_OUTS) $(HOST_I18N_DATA) $(HOST_TZDATA_DATA)
.PHONY: build-art-target
build-art-target: $(TARGET_OUT_EXECUTABLES)/art $(ART_TARGET_DEPENDENCIES) $(TARGET_CORE_IMG_OUTS)
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index 7cb88c3..268c659 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -126,8 +126,12 @@
CONSCRYPT_APEX := com.android.conscrypt
# i18n APEX
I18N_APEX := com.android.i18n
+# Tzdata APEX
+TZDATA_APEX := com.android.tzdata
# A phony file to create the ICU data file for host.
HOST_I18N_DATA := $(HOST_OUT)/$(I18N_APEX)/timestamp
+# A phony file to create the tz data file for host.
+HOST_TZDATA_DATA := $(HOST_OUT)/$(TZDATA_APEX)/timestamp
endif # ART_ANDROID_COMMON_PATH_MK