Merge "Add a host simulation of the tzdata module"
diff --git a/output_data/android/Android.mk b/output_data/android/Android.mk
index 0da3b73..d07b8db 100644
--- a/output_data/android/Android.mk
+++ b/output_data/android/Android.mk
@@ -17,8 +17,7 @@
ifeq ($(WITH_HOST_DALVIK),true)
-# A host version of the tzlookup.xml module for use by
-# hostdex rules.
+# Host simulations of APEX modules for use by hostdex rules.
# Simulate the runtime module.
include $(CLEAR_VARS)
@@ -31,4 +30,15 @@
LOCAL_MODULE_PATH := $(HOST_OUT)/com.android.runtime/etc/tz
include $(BUILD_PREBUILT)
+# Simulate the time zone data module.
+include $(CLEAR_VARS)
+LOCAL_MODULE := tzlookup.xml_host_tzdata_apex
+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)/com.android.tzdata/etc/tz
+include $(BUILD_PREBUILT)
+
endif
diff --git a/output_data/iana/Android.mk b/output_data/iana/Android.mk
index 150860f..d00780b 100644
--- a/output_data/iana/Android.mk
+++ b/output_data/iana/Android.mk
@@ -17,8 +17,7 @@
ifeq ($(WITH_HOST_DALVIK),true)
-# A host version of the tzdata module for use by
-# hostdex rules.
+# Host simulations of APEX modules for use by hostdex rules.
# Simulate the runtime module.
include $(CLEAR_VARS)
@@ -31,4 +30,15 @@
LOCAL_MODULE_PATH := $(HOST_OUT)/com.android.runtime/etc/tz
include $(BUILD_PREBUILT)
+# Simulate the time zone data module.
+include $(CLEAR_VARS)
+LOCAL_MODULE := tzdata_host_tzdata_apex
+LOCAL_IS_HOST_MODULE := true
+LOCAL_SRC_FILES := tzdata
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_STEM := $(LOCAL_SRC_FILES)
+LOCAL_MODULE_PATH := $(HOST_OUT)/com.android.tzdata/etc/tz
+include $(BUILD_PREBUILT)
+
endif
diff --git a/output_data/icu_overlay/Android.mk b/output_data/icu_overlay/Android.mk
new file mode 100644
index 0000000..17f8eee
--- /dev/null
+++ b/output_data/icu_overlay/Android.mk
@@ -0,0 +1,33 @@
+# -*- mode: makefile -*-
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+
+ifeq ($(WITH_HOST_DALVIK),true)
+
+# Host simulations of APEX modules for use by hostdex rules.
+
+# Simulate the time zone data module.
+include $(CLEAR_VARS)
+LOCAL_MODULE := icu_tzdata.dat_host_tzdata_apex
+LOCAL_IS_HOST_MODULE := true
+LOCAL_SRC_FILES := icu_tzdata.dat
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_STEM := $(LOCAL_SRC_FILES)
+LOCAL_MODULE_PATH := $(HOST_OUT)/com.android.tzdata/etc/icu
+include $(BUILD_PREBUILT)
+
+endif
diff --git a/output_data/version/Android.mk b/output_data/version/Android.mk
index 1a0316b..3136f0a 100644
--- a/output_data/version/Android.mk
+++ b/output_data/version/Android.mk
@@ -17,8 +17,7 @@
ifeq ($(WITH_HOST_DALVIK),true)
-# A host version of the tz_version module for use by
-# hostdex rules.
+# Host simulations of APEX modules for use by hostdex rules.
# Simulate the runtime module
include $(CLEAR_VARS)
@@ -31,4 +30,15 @@
LOCAL_MODULE_PATH := $(HOST_OUT)/com.android.runtime/etc/tz
include $(BUILD_PREBUILT)
+# Simulate the time zone data module
+include $(CLEAR_VARS)
+LOCAL_MODULE := tz_version_host_tzdata_apex
+LOCAL_IS_HOST_MODULE := true
+LOCAL_SRC_FILES := tz_version
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_STEM := $(LOCAL_SRC_FILES)
+LOCAL_MODULE_PATH := $(HOST_OUT)/com.android.tzdata/etc/tz
+include $(BUILD_PREBUILT)
+
endif
