Merge "rename aidl/library.bzl to aidl/aidl_library.bzl" am: 840d49a564
am: 0110b797e8
am: 2caef94970
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2515436 Change-Id: Ibe1ef9d638b20f38753b767d24674bc97b6c337d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -126,7 +126,7 @@ func (fg *fileGroup) ConvertWithBp2build(ctx TopDownMutatorContext) {
|
||||
|
||||
props := bazel.BazelTargetModuleProperties{
|
||||
Rule_class: "aidl_library",
|
||||
Bzl_load_location: "//build/bazel/rules/aidl:library.bzl",
|
||||
Bzl_load_location: "//build/bazel/rules/aidl:aidl_library.bzl",
|
||||
}
|
||||
|
||||
ctx.CreateBazelTargetModule(
|
||||
|
@@ -915,7 +915,7 @@ func bp2buildCcAidlLibrary(
|
||||
ctx.CreateBazelTargetModule(
|
||||
bazel.BazelTargetModuleProperties{
|
||||
Rule_class: "aidl_library",
|
||||
Bzl_load_location: "//build/bazel/rules/aidl:library.bzl",
|
||||
Bzl_load_location: "//build/bazel/rules/aidl:aidl_library.bzl",
|
||||
},
|
||||
android.CommonAttributes{Name: aidlLibName},
|
||||
&aidlLibraryAttributes{
|
||||
|
@@ -2771,7 +2771,7 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext)
|
||||
ctx.CreateBazelTargetModule(
|
||||
bazel.BazelTargetModuleProperties{
|
||||
Rule_class: "aidl_library",
|
||||
Bzl_load_location: "//build/bazel/rules/aidl:library.bzl",
|
||||
Bzl_load_location: "//build/bazel/rules/aidl:aidl_library.bzl",
|
||||
},
|
||||
android.CommonAttributes{Name: aidlLibName},
|
||||
&aidlLibraryAttributes{
|
||||
@@ -2786,7 +2786,7 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext)
|
||||
ctx.CreateBazelTargetModule(
|
||||
bazel.BazelTargetModuleProperties{
|
||||
Rule_class: "java_aidl_library",
|
||||
Bzl_load_location: "//build/bazel/rules/java:aidl_library.bzl",
|
||||
Bzl_load_location: "//build/bazel/rules/java:java_aidl_library.bzl",
|
||||
},
|
||||
android.CommonAttributes{Name: javaAidlLibName},
|
||||
&javaAidlLibraryAttributes{
|
||||
|
Reference in New Issue
Block a user