summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2019-04-29 12:59:32 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-04-29 12:59:32 +0000
commitf5eaea32b6fd9b45a97717627a02b950c4f9ca06 (patch)
tree287fe43be9e08f43818902d585a5590dcf538192
parentdfa3231faec81cef7eae40d165c5852395f57577 (diff)
parenta7db90f32d4c1072f1c52a76d2c7b4314edb4f08 (diff)
Merge "Move /system dependency on tz_version to bionic"
-rw-r--r--README.md7
-rw-r--r--libc/Android.bp5
2 files changed, 7 insertions, 5 deletions
diff --git a/README.md b/README.md
index 5f7824918..f81558a4d 100644
--- a/README.md
+++ b/README.md
@@ -193,10 +193,9 @@ build your device drivers, you shouldn't modify bionic. Instead use
## Updating tzdata
-This is fully automated (and these days handled by the libcore team, because
-they own icu, and that needs to be updated in sync with bionic):
-
- 1. Run update-tzdata.py in external/icu/tools/.
+This is handled by the libcore team, because they own icu, and that needs to be
+updated in sync with bionic). See
+[system/timezone/README.android](https://android.googlesource.com/platform/system/timezone/+/master/README.android).
## Verifying changes
diff --git a/libc/Android.bp b/libc/Android.bp
index 174783fa6..fa1eab6cb 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1578,7 +1578,10 @@ cc_library {
],
},
- required: ["tzdata"],
+ required: [
+ "tzdata",
+ "tz_version", // Version metadata for tzdata to help debugging.
+ ],
// Leave the symbols in the shared library so that stack unwinders can produce
// meaningful name resolution.