summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alex Márquez Pérez Muñíz Díaz Púras Thaureaux <alexmarquez@google.com> 2022-04-21 14:55:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-21 14:55:23 +0000
commit9ea047d5e3f2b471223f8fadfdd9548d24d1b523 (patch)
treed8331e35b19929f7ce9edce3cff131a88ff3f8f3
parent423fb975412abec99db614f49a1a3a498e206cdf (diff)
parentbff2e88a8512d8184bdb7fa0af60dc86752c2284 (diff)
DoNotConvert tzdata nor tz_version am: bff2e88a85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2069572 Change-Id: Ib46e17f36142a262e20463509926a00b32cc89b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--android/allowlists/allowlists.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go
index 72961e660..4fd4f134b 100644
--- a/android/allowlists/allowlists.go
+++ b/android/allowlists/allowlists.go
@@ -367,6 +367,10 @@ var (
"timezone-host", // depends on unconverted modules: art.module.api.annotations
"truth-host-prebuilt", // depends on unconverted modules: truth-prebuilt
"truth-prebuilt", // depends on unconverted modules: asm-7.0, guava
+
+ // b/215723302; awaiting tz{data,_version} to then rename targets conflicting with srcs
+ "tzdata",
+ "tz_version",
}
Bp2buildCcLibraryStaticOnlyList = []string{}