summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkDacek <dacek@google.com>2022-07-08 20:25:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-07-08 20:25:20 +0000
commitb6839d605f457c90535cc17bf37c74f2518f1125 (patch)
tree59890db98e383d8515c9333b15ae0ed66355f0a9
parent47a033f55f3f9c18f327d28a8fe38d3f70a7d13e (diff)
parent0a17bbfc13413048f508eeed5ff374c03d929ade (diff)
downloadnative_bridge_support-b6839d605f457c90535cc17bf37c74f2518f1125.tar.gz
Rename tzdata dependency to account for name-source collision fix. am: 921ea8ee59 am: c6181d811b am: f01cd569c0 am: 44e564036a am: 0a17bbfc13
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/native_bridge_support/+/2139112 Change-Id: I8c3fe9f098059fe6220cfedf80cdf9926a9bb423 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",