Remove -host suffix from tzdata and tzlookup.xml
This simplifies libcore hostdex support in soong.
LOCAL_REQUIRED_MODULES will already find the correct host
or device modules.
Bug: 67600882
Test: m -j checkbuild
Change-Id: Ieb349c1f5d2fd12f349b4898a6eee18b10c0a7e0
diff --git a/output_data/android/Android.mk b/output_data/android/Android.mk
index c730ae3..10f3caa 100644
--- a/output_data/android/Android.mk
+++ b/output_data/android/Android.mk
@@ -11,8 +11,11 @@
ifeq ($(WITH_HOST_DALVIK),true)
+# A host version of the tzlookup.xml module for use by
+# hostdex rules.
+
include $(CLEAR_VARS)
-LOCAL_MODULE := tzlookup.xml-host
+LOCAL_MODULE := tzlookup.xml
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_IS_HOST_MODULE := true
LOCAL_SRC_FILES := tzlookup.xml
diff --git a/output_data/iana/Android.mk b/output_data/iana/Android.mk
index 13c5762..5aafd17 100644
--- a/output_data/iana/Android.mk
+++ b/output_data/iana/Android.mk
@@ -11,8 +11,11 @@
ifeq ($(WITH_HOST_DALVIK),true)
+# A host version of the tzdata module for use by
+# hostdex rules.
+
include $(CLEAR_VARS)
-LOCAL_MODULE := tzdata-host
+LOCAL_MODULE := tzdata
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_IS_HOST_MODULE := true
LOCAL_SRC_FILES := tzdata
