Merge "Move /system dependency on tz_version to bionic"
diff --git a/README.md b/README.md
index 5f78249..f81558a 100644
--- a/README.md
+++ b/README.md
@@ -193,10 +193,9 @@
## 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 174783f..fa1eab6 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1578,7 +1578,10 @@
],
},
- 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.