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

Abstract prebuilt_etc into prebuilt_file

Browse source 
Bug: 215723302
Test: bp2build.sh
Test: mixed_{libc,droid}.sh
Change-Id: I0dab7a6209320e31cfdfe1ce28cacd4f37c11024
This commit is contained in:
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux 2022-02-28 17:38:34 -05:00
parent 13642d4735
commit b81f77ed24
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bp2build/prebuilt_etc_conversion_test.go
View file

@ -45,7 +45,7 @@ prebuilt_etc {
} }
`, `,
expectedBazelTargets: []string{ expectedBazelTargets: []string{
makeBazelTarget("prebuilt_etc", "apex_tz_version", attrNameToString{ makeBazelTarget("prebuilt_file", "apex_tz_version", attrNameToString{
"filename": `"tz_version"`, "filename": `"tz_version"`,
"installable": `False`, "installable": `False`,
"src": `"version/tz_version"`, "src": `"version/tz_version"`,
@ -75,7 +75,7 @@ prebuilt_etc {
} }
`, `,
expectedBazelTargets: []string{ expectedBazelTargets: []string{
makeBazelTarget("prebuilt_etc", "apex_tz_version", attrNameToString{ makeBazelTarget("prebuilt_file", "apex_tz_version", attrNameToString{
"filename": `"tz_version"`, "filename": `"tz_version"`,
"installable": `False`, "installable": `False`,
"src": `select({ "src": `select({
@ -114,7 +114,7 @@ prebuilt_etc {
} }
`, `,
expectedBazelTargets: []string{ expectedBazelTargets: []string{
makeBazelTarget("prebuilt_etc", "apex_tz_version", attrNameToString{ makeBazelTarget("prebuilt_file", "apex_tz_version", attrNameToString{
"filename": `"tz_version"`, "filename": `"tz_version"`,
"installable": `False`, "installable": `False`,
"src": `select({ "src": `select({

4
etc/prebuilt_etc.go
View file

@ -723,8 +723,8 @@ func prebuiltEtcBp2BuildInternal(ctx android.TopDownMutatorContext, module *Preb
} }
props := bazel.BazelTargetModuleProperties{ props := bazel.BazelTargetModuleProperties{
Rule_class: "prebuilt_etc", Rule_class: "prebuilt_file",
Bzl_load_location: "//build/bazel/rules:prebuilt_etc.bzl", Bzl_load_location: "//build/bazel/rules:prebuilt_file.bzl",
} }
ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: module.Name()}, attrs) ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: module.Name()}, attrs)