StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Abstract prebuilt_etc into prebuilt_file am: b81f77ed24

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2002752

Change-Id: Ica34b683a4696e86feabe0a6fd7f0fd0561d906f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
2022-04-21 14:55:26 +00:00
committed by Automerger Merge Worker
parent 9ea047d5e3 b81f77ed24
commit c0fa5fb34e
2 changed files with 5 additions and 5 deletions
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)