commit 3160f43cb87f88cce38a8f29ce861aab85872468
author Neil Fuller <nfuller@google.com> Mon Nov 12 18:09:37 2018 +0000
committer Neil Fuller <nfuller@google.com> Mon Dec 10 19:42:13 2018 +0000
tree df9ad94de1937da1e4bca7f3d46de6773b136b87
parent 0d1994cc8058fa70b150400f6a3194e5001b0b61

Remove tzlookup.xml prebuilt

Remove tzlookup.xml prebuilt as the file has moved inside
the runtime module APEX file.

Bug: 119293618
Test: build / boot
Test: CTS: run cts -m CtsLibcoreTestCases -t libcore.libcore.icu.TimeZoneIntegrationTest
Change-Id: I3112562e0d7424603722dc6e760a80a40cf8b5a4

output_data/android/Android.mk

diff --git a/output_data/android/Android.mk b/output_data/android/Android.mk
index 178454a..2d16a0b 100644
--- a/output_data/android/Android.mk
+++ b/output_data/android/Android.mk
@@ -15,14 +15,6 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := tzlookup.xml
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/zoneinfo
-include $(BUILD_PREBUILT)
-
 ifeq ($(WITH_HOST_DALVIK),true)
 
 # A host version of the tzlookup.xml module for use by
@@ -35,7 +27,7 @@
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_STEM := $(LOCAL_SRC_FILES)
-LOCAL_MODULE_PATH := $(HOST_OUT)/usr/share/zoneinfo
+LOCAL_MODULE_PATH := $(HOST_OUT)/com.android.runtime/etc/tz
 include $(BUILD_PREBUILT)
 
 endif