From bff2e88a8512d8184bdb7fa0af60dc86752c2284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20M=C3=A1rquez=20P=C3=A9rez=20Mu=C3=B1=C3=ADz=20D?= =?UTF-8?q?=C3=ADaz=20P=C3=BAras=20Thaureaux?= Date: Wed, 20 Apr 2022 18:44:54 +0000 Subject: [PATCH] DoNotConvert tzdata nor tz_version In using prebuilt_file for prebuilt_{etc,usr_share}, Bazel now sees such targets translated and doesn't permit a target name to alias e.g. its `src`. Thus we temporarily disable the conversion of the `tz_version` and `tzdata` whilst their in-tree sources are updated. Their conversions will be reenabled afterward. Bug: 215723302 Test: bp2build.sh Test: mixed_{libc,droid}.sh Change-Id: Ie19813ccb0fb93c90b54bfd19c909ed15b826385 --- android/allowlists/allowlists.go | 4 ++++ 1 file changed, 4 insertions(+) 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{}