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

Commit b81f77ed authored by Alex Márquez Pérez Muñíz Díaz Púras Thaureaux's avatar Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
Browse files

Abstract prebuilt_etc into prebuilt_file 

Bug: 215723302
Test: bp2build.sh
Test: mixed_{libc,droid}.sh
Change-Id: I0dab7a6209320e31cfdfe1ce28cacd4f37c11024
parent 13642d47

bp2build/prebuilt_etc_conversion_test.go

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ prebuilt_etc { 
}

`,

		expectedBazelTargets: []string{

			makeBazelTarget("prebuilt_etc", "apex_tz_version", attrNameToString{

			makeBazelTarget("prebuilt_file", "apex_tz_version", attrNameToString{

				"filename":    `"tz_version"`,

				"installable": `False`,

				"src":         `"version/tz_version"`,
@@ -75,7 +75,7 @@ prebuilt_etc { 
}

`,

		expectedBazelTargets: []string{

			makeBazelTarget("prebuilt_etc", "apex_tz_version", attrNameToString{

			makeBazelTarget("prebuilt_file", "apex_tz_version", attrNameToString{

				"filename":    `"tz_version"`,

				"installable": `False`,

				"src": `select({
@@ -114,7 +114,7 @@ prebuilt_etc { 
}

`,

		expectedBazelTargets: []string{

			makeBazelTarget("prebuilt_etc", "apex_tz_version", attrNameToString{

			makeBazelTarget("prebuilt_file", "apex_tz_version", attrNameToString{

				"filename":    `"tz_version"`,

				"installable": `False`,

				"src": `select({

etc/prebuilt_etc.go

+2 −2
Original line number Diff line number Diff line
@@ -723,8 +723,8 @@ func prebuiltEtcBp2BuildInternal(ctx android.TopDownMutatorContext, module *Preb 
	}



	props := bazel.BazelTargetModuleProperties{

		Rule_class:        "prebuilt_etc",

		Bzl_load_location: "//build/bazel/rules:prebuilt_etc.bzl",

		Rule_class:        "prebuilt_file",

		Bzl_load_location: "//build/bazel/rules:prebuilt_file.bzl",

	}



	ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: module.Name()}, attrs)