Skip to content

Commit

Permalink
Update rules_android to fix failures with bazel @ head
Browse files Browse the repository at this point in the history
fixes: #6762
PiperOrigin-RevId: 676905442
  • Loading branch information
mai93 authored and copybara-github committed Sep 20, 2024
1 parent 2875224 commit 4f5c27c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
8 changes: 5 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -503,11 +503,13 @@ rules_proto_setup()
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
rules_proto_toolchains()

RULES_ANDROID_COMMIT = "57bed3f556c698b0a0e692f729ed7edfd804db98"

http_archive(
name = "rules_android",
sha256 = "b1599e4604c1594a1b0754184c5e50f895a68f444d1a5a82b688b2370d990ba0",
strip_prefix = "rules_android-0.5.1",
url = "https://github.com/bazelbuild/rules_android/releases/download/v0.5.1/rules_android-v0.5.1.tar.gz",
sha256 = "e1ee3cd26581bd563f8087a9d325b97f130ab26cd5dede7139340603a93223d5",
strip_prefix = "rules_android-" + RULES_ANDROID_COMMIT,
urls = ["https://github.com/bazelbuild/rules_android/archive/%s.zip" % RULES_ANDROID_COMMIT],
)
load("@rules_android//:prereqs.bzl", "rules_android_prereqs")
rules_android_prereqs()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,12 @@ def scopeForAndroidPackage(blaze_package):

def scopeForAndroidPackageWithResources(blaze_package):
label = Label(blaze_package)
resource_dir = "_migrated/"

return scopeForAndroidPackage(blaze_package) + [
"//" + label.package + ":" + label.name + ".aar",
"//" + label.package + ":" + resource_dir + label.name + ".srcjar",
"//" + label.package + ":" + resource_dir + label.name + "_resources.jar",
"//" + label.package + ":" + resource_dir + label.name + "_symbols/R.txt",
"//" + label.package + ":" + label.name + ".srcjar",
"//" + label.package + ":" + label.name + "_resources.jar",
"//" + label.package + ":" + label.name + "_symbols/R.txt",
]

def scopeForAndroidBinary(blaze_package):
Expand Down

0 comments on commit 4f5c27c

Please sign in to comment.