From fe9713871428c62d9cd6adf15e9a99b0291faa73 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Tue, 13 Jun 2017 19:13:02 +0100 Subject: Track move of files from bionic to system/timezone Time zone related files are moving from bionic to system/timezone. Bug: 31008728 Bug: 36882778 Test: make robolectric_android-all Change-Id: I2feb42f3bb990b0c7f5bd1229a900d92d5a18888 --- Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index c30e38b5b..0aed1c52e 100644 --- a/Android.mk +++ b/Android.mk @@ -44,8 +44,8 @@ include $(BUILD_STATIC_JAVA_LIBRARY) # Copy the tzdata, preserving its path. $(LOCAL_INTERMEDIATE_TARGETS): $(call copy-many-files,\ - bionic/libc/zoneinfo/tzdata:$(intermediates.COMMON)/usr/share/zoneinfo/tzdata \ - bionic/libc/zoneinfo/tzlookup.xml:$(intermediates.COMMON)/usr/share/zoneinfo/tzlookup.xml) + system/timezone/output_data/iana/tzdata:$(intermediates.COMMON)/usr/share/zoneinfo/tzdata \ + system/timezone/output_data/android/tzlookup.xml:$(intermediates.COMMON)/usr/share/zoneinfo/tzlookup.xml) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_EXTRA_JAR_ARGS += \ -C "$(intermediates.COMMON)" "usr/share/zoneinfo" -- cgit v1.2.3