diff options
| author | 2023-03-31 20:10:39 +0000 | |
|---|---|---|
| committer | 2023-03-31 20:10:39 +0000 | |
| commit | f5b59e98d4474315a4c7a8040872bb4ecd8ed5cc (patch) | |
| tree | 3dae91f3f87b7b7e04a67bc04dbc1cdcadbc3922 | |
| parent | bed1d1cb110a7dc3a9e35764ac4578dfe7d2c00a (diff) | |
| parent | 2caef9497006724574768e901638b557362662fd (diff) | |
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>
| -rw-r--r-- | android/filegroup.go | 2 | ||||
| -rw-r--r-- | cc/bp2build.go | 2 | ||||
| -rw-r--r-- | java/java.go | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/android/filegroup.go b/android/filegroup.go index 38de8558f..c259f2106 100644 --- a/android/filegroup.go +++ b/android/filegroup.go @@ -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( diff --git a/cc/bp2build.go b/cc/bp2build.go index 7c817a2b1..c8f516cdc 100644 --- a/cc/bp2build.go +++ b/cc/bp2build.go @@ -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{ diff --git a/java/java.go b/java/java.go index 58afe5aa8..7a6eeb9e0 100644 --- a/java/java.go +++ b/java/java.go @@ -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{ |