diff options
| -rw-r--r-- | android/allowlists/allowlists.go | 3 | ||||
| -rw-r--r-- | bp2build/conversion.go | 2 | ||||
| -rw-r--r-- | bp2build/conversion_test.go | 8 |
3 files changed, 13 insertions, 0 deletions
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 1ece9fa7d..7f3dd2dbe 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -365,6 +365,8 @@ var ( "system/testing/gtest_extras": Bp2BuildDefaultTrueRecursively, "system/timezone/apex": Bp2BuildDefaultTrueRecursively, "system/timezone/output_data": Bp2BuildDefaultTrueRecursively, + "system/timezone/testdata": Bp2BuildDefaultTrueRecursively, + "system/timezone/testing": Bp2BuildDefaultTrueRecursively, "system/tools/aidl/build/tests_bp2build": Bp2BuildDefaultTrue, "system/tools/aidl/metadata": Bp2BuildDefaultTrue, "system/tools/hidl/metadata": Bp2BuildDefaultTrue, @@ -1471,6 +1473,7 @@ var ( // M5: tzdata launch "com.android.tzdata", "test1_com.android.tzdata", + "test3_com.android.tzdata", // M7: adbd launch "com.android.adbd", "test_com.android.adbd", diff --git a/bp2build/conversion.go b/bp2build/conversion.go index 21e9c095b..815461ab6 100644 --- a/bp2build/conversion.go +++ b/bp2build/conversion.go @@ -50,7 +50,9 @@ func soongInjectionFiles(cfg android.Config, metrics CodegenMetrics) ([]BazelFil 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())) diff --git a/bp2build/conversion_test.go b/bp2build/conversion_test.go index e73ad2e76..2f5dc3cb7 100644 --- a/bp2build/conversion_test.go +++ b/bp2build/conversion_test.go @@ -131,9 +131,17 @@ func TestCreateBazelFiles_Bp2Build_CreatesDefaultFiles(t *testing.T) { }, { 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", }, |