tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Jingwen Chen 2023-04-12 06:50:26 +00:00 committed by Gerrit Code Review
commit aea34a38ca
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/allowlists/allowlists.go
View file

@ -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",

2
bp2build/conversion.go
View file

@ -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()))

8
bp2build/conversion_test.go
View file

@ -129,10 +129,18 @@ func TestCreateBazelFiles_Bp2Build_CreatesDefaultFiles(t *testing.T) {
dir: "metrics",
basename: "converted_modules.txt",
},
{
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",