commit 6015e556fdaf0c2d86e8ec998dbbd9526b51ac17
author Neil Fuller <nfuller@google.com> Mon Jan 07 11:41:13 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 07 11:41:13 2019 +0000
tree b8495c9cf68981b796b5f1fb539b6723a4162f9f
parent 7362fbc8860fcc45d64c791147dc7e4b70dc180d
parent 136579ec1f009fc6d6210f4cc5f27bab15598be5

Merge "Add python3 support for tools"

output_data/android/Android.mk

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

output_data/iana/Android.mk

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

output_data/version/Android.mk

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