summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkDacek <dacek@google.com>2022-07-08 19:08:55 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-07-08 19:08:55 +0000
commitf01cd569c0769c5ee38da086ee606d66909f5213 (patch)
tree59890db98e383d8515c9333b15ae0ed66355f0a9
parenta7a5ef9462b13a4f54c0903a902ce51d67e33f98 (diff)
parentc6181d811bd1bbdb010ac7dc119c336fb689c969 (diff)
downloadnative_bridge_support-f01cd569c0769c5ee38da086ee606d66909f5213.tar.gz
Rename tzdata dependency to account for name-source collision fix. am: 921ea8ee59 am: c6181d811b
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/native_bridge_support/+/2139112 Change-Id: Ie4f2569dc28ff764e392de5cc3c957463a8c6ae6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libc/Android.bp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/Android.bp b/libc/Android.bp
index 61712ad..c31fe45 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -108,7 +108,7 @@ cc_library {
nocrt: true,
- required: ["tzdata"],
+ required: ["tzdata_prebuilt"],
whole_static_libs: [
"gwp_asan",