From 5ccb460c42f4768be145fb5f5377afca3d3bcff9 Mon Sep 17 00:00:00 2001 From: Romain Jobredeaux Date: Mon, 19 Dec 2022 11:17:16 -0500 Subject: [PATCH] Use centralized rules.bzl file for android rules in bp2build. Change-Id: I6e4837d8b6715960337d0db9b36f8137efb5673e --- java/aar.go | 4 ++-- java/app.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/aar.go b/java/aar.go index f4a2ff287..60b04365d 100644 --- a/java/aar.go +++ b/java/aar.go @@ -1031,7 +1031,7 @@ func (a *AARImport) ConvertWithBp2build(ctx android.TopDownMutatorContext) { ctx.CreateBazelTargetModule( bazel.BazelTargetModuleProperties{ 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}, &bazelAndroidLibraryImport{ @@ -1057,7 +1057,7 @@ func (a *AndroidLibrary) ConvertWithBp2build(ctx android.TopDownMutatorContext) name := a.Name() props := bazel.BazelTargetModuleProperties{ Rule_class: "android_library", - Bzl_load_location: "@rules_android//rules:rules.bzl", + Bzl_load_location: "//build/bazel/rules/android:rules.bzl", } ctx.CreateBazelTargetModule( diff --git a/java/app.go b/java/app.go index 3c5760b58..8338f74e3 100755 --- a/java/app.go +++ b/java/app.go @@ -1476,7 +1476,7 @@ func androidAppCertificateBp2Build(ctx android.TopDownMutatorContext, module *An props := bazel.BazelTargetModuleProperties{ 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) @@ -1515,7 +1515,7 @@ func (a *AndroidApp) ConvertWithBp2build(ctx android.TopDownMutatorContext) { props := bazel.BazelTargetModuleProperties{ 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)