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

Merge "Use centralized rules.bzl file for android rules in bp2build."

Browse Source
This commit is contained in:
Romain Jobredeaux
2023-01-12 18:46:48 +00:00
committed by Gerrit Code Review
parent 2b4bc2fddb 5ccb460c42
commit 3095d8e7bc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/aar.go
View File

@@ -1031,7 +1031,7 @@ func (a *AARImport) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
ctx.CreateBazelTargetModule( ctx.CreateBazelTargetModule(
bazel.BazelTargetModuleProperties{ bazel.BazelTargetModuleProperties{
Rule_class: "aar_import", Rule_class: "aar_import",
Bzl_load_location: "@rules_android//rules:rules.bzl", Bzl_load_location: "//build/bazel/rules/android:rules.bzl",
}, },
android.CommonAttributes{Name: name}, android.CommonAttributes{Name: name},
&bazelAndroidLibraryImport{ &bazelAndroidLibraryImport{
@@ -1057,7 +1057,7 @@ func (a *AndroidLibrary) ConvertWithBp2build(ctx android.TopDownMutatorContext)
name := a.Name() name := a.Name()
props := bazel.BazelTargetModuleProperties{ props := bazel.BazelTargetModuleProperties{
Rule_class: "android_library", Rule_class: "android_library",
Bzl_load_location: "@rules_android//rules:rules.bzl", Bzl_load_location: "//build/bazel/rules/android:rules.bzl",
} }
ctx.CreateBazelTargetModule( ctx.CreateBazelTargetModule(

4
java/app.go
View File

@@ -1478,7 +1478,7 @@ func androidAppCertificateBp2Build(ctx android.TopDownMutatorContext, module *An
props := bazel.BazelTargetModuleProperties{ props := bazel.BazelTargetModuleProperties{
Rule_class: "android_app_certificate", Rule_class: "android_app_certificate",
Bzl_load_location: "//build/bazel/rules/android:android_app_certificate.bzl", Bzl_load_location: "//build/bazel/rules/android:rules.bzl",
} }
ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: module.Name()}, attrs) ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: module.Name()}, attrs)
@@ -1517,7 +1517,7 @@ func (a *AndroidApp) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
props := bazel.BazelTargetModuleProperties{ props := bazel.BazelTargetModuleProperties{
Rule_class: "android_binary", Rule_class: "android_binary",
Bzl_load_location: "//build/bazel/rules/android:android_binary.bzl", Bzl_load_location: "//build/bazel/rules/android:rules.bzl",
} }
ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: a.Name()}, attrs) ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: a.Name()}, attrs)