commit 6134211c2d76dc10b6239ee9568dc4aea68f800b
author Jingwen Chen <jingwen@google.com> Tue Apr 11 08:49:01 2023 +0000
committer Jingwen Chen <jingwen@google.com> Tue Apr 11 14:55:27 2023 +0000
tree 0d079a4e95f8792991cb45b76f41079b05dd0607
parent ed35066ec76eefeb97784cd9782013d63fc6a149

Revert^2 "Re-land test tzdata apex with bazel builds."

fb8b1a69e9b3a57b136de5ee6cb2999223cfb42b

Change-Id: Id5c0edd1cd4aacbb75a8019e0a5ada4e608fbf09

bp2build/conversion.go

diff --git a/bp2build/conversion.go b/bp2build/conversion.go
index 6a39e25..5c11876 100644
--- a/bp2build/conversion.go
+++ b/bp2build/conversion.go
@@ -48,7 +48,9 @@
 	if err != nil {
 		panic(err)
 	}
+	files = append(files, newFile("metrics", GeneratedBuildFileName, "")) // Creates a //metrics package.
 	files = append(files, newFile("metrics", "converted_modules_path_map.json", string(convertedModulePathMap)))
+	files = append(files, newFile("metrics", "converted_modules_path_map.bzl", "modules = "+strings.ReplaceAll(string(convertedModulePathMap), "\\", "\\\\")))
 
 	files = append(files, newFile("product_config", "soong_config_variables.bzl", cfg.Bp2buildSoongConfigDefinitions.String()))
 

bp2build/conversion_test.go

diff --git a/bp2build/conversion_test.go b/bp2build/conversion_test.go
index 8c1d2ae..966f6e7 100644
--- a/bp2build/conversion_test.go
+++ b/bp2build/conversion_test.go
@@ -131,9 +131,17 @@
 		},
 		{
 			dir:      "metrics",
+			basename: "BUILD.bazel",
+		},
+		{
+			dir:      "metrics",
 			basename: "converted_modules_path_map.json",
 		},
 		{
+			dir:      "metrics",
+			basename: "converted_modules_path_map.bzl",
+		},
+		{
 			dir:      "product_config",
 			basename: "soong_config_variables.bzl",
 		},