diff options
| author | Neil Fuller <nfuller@google.com> | 2017-06-13 19:13:02 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2017-06-15 14:13:09 +0000 |
| commit | c35e9c5a25433d1e4beb65993bf8a326916fb2cb (patch) | |
| tree | 36a350e1e35ede7baf9ef9be75819c17876db0eb | |
| parent | bece8b3a3764ee6db56e91e46eeea6c225e55b20 (diff) | |
| download | robolectric-android-o-mr1-preview-1.tar.gz | |
Track move of files from bionic to system/timezoneandroid-o-mr1-preview-2android-o-mr1-preview-1
Time zone related files are moving from bionic
to system/timezone.
Bug: 31008728
Bug: 36882778
Test: make robolectric_android-all
Change-Id: I2feb42f3bb990b0c7f5bd1229a900d92d5a18888
(cherry picked from commit fe9713871428c62d9cd6adf15e9a99b0291faa73)
(cherry picked from commit d270cb32f4c268b80e21ad3bd098f94769da7f89)
| -rw-r--r-- | Android.mk | 4 |
1 files 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" |