Merge "Add python3 support for tools"
diff --git a/output_data/android/Android.mk b/output_data/android/Android.mk
index 2d16a0b..0da3b73 100644
--- a/output_data/android/Android.mk
+++ b/output_data/android/Android.mk
@@ -20,8 +20,9 @@
# A host version of the tzlookup.xml module for use by
# hostdex rules.
+# Simulate the runtime module.
include $(CLEAR_VARS)
-LOCAL_MODULE := tzlookup.xml
+LOCAL_MODULE := tzlookup.xml_host_runtime_apex
LOCAL_IS_HOST_MODULE := true
LOCAL_SRC_FILES := tzlookup.xml
LOCAL_MODULE_CLASS := ETC
diff --git a/output_data/iana/Android.mk b/output_data/iana/Android.mk
index a6b55f6..f7995e9 100644
--- a/output_data/iana/Android.mk
+++ b/output_data/iana/Android.mk
@@ -28,8 +28,9 @@
# A host version of the tzdata module for use by
# hostdex rules.
+# Simulate /system
include $(CLEAR_VARS)
-LOCAL_MODULE := tzdata
+LOCAL_MODULE := tzdata_host
LOCAL_IS_HOST_MODULE := true
LOCAL_SRC_FILES := tzdata
LOCAL_MODULE_CLASS := ETC
@@ -38,4 +39,15 @@
LOCAL_MODULE_PATH := $(HOST_OUT)/usr/share/zoneinfo
include $(BUILD_PREBUILT)
+# Simulate the runtime module.
+include $(CLEAR_VARS)
+LOCAL_MODULE := tzdata_host_runtime_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.runtime/etc/tz
+include $(BUILD_PREBUILT)
+
endif
diff --git a/output_data/version/Android.mk b/output_data/version/Android.mk
index cd0659b..3ff89a1 100644
--- a/output_data/version/Android.mk
+++ b/output_data/version/Android.mk
@@ -28,14 +28,26 @@
# A host version of the tz_version module for use by
# hostdex rules.
+# Simulate /system
include $(CLEAR_VARS)
-LOCAL_MODULE := tz_version
+LOCAL_MODULE := tz_version_host
LOCAL_IS_HOST_MODULE := true
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
+LOCAL_SRC_FILES := tz_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)
+# Simulate the runtime module
+include $(CLEAR_VARS)
+LOCAL_MODULE := tz_version_host_runtime_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.runtime/etc/tz
+include $(BUILD_PREBUILT)
+
endif