Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6134211c authored by Jingwen Chen's avatar Jingwen Chen
Browse files

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

fb8b1a69

Change-Id: Id5c0edd1cd4aacbb75a8019e0a5ada4e608fbf09
parent ed35066e

android/allowlists/allowlists.go

+3 −0
Original line number Diff line number Diff line
@@ -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",

bp2build/conversion.go

+2 −0
Original line number Diff line number Diff line
@@ -48,7 +48,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()))

bp2build/conversion_test.go

+8 −0
Original line number Diff line number Diff line
@@ -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",