diff options
author | Alex Humesky <ahumesky@google.com> | 2021-03-22 20:15:41 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-22 20:15:41 +0000 |
commit | cf1903cf5c87759121c4d2fe9392e337046be8cc (patch) | |
tree | 4ff6434731886c36f5a6eef7606a7d31696542df | |
parent | 4853710de605fea0a612deade778402daf654353 (diff) | |
parent | a59fc225f8a4c9cc21d903f2ca2dfef65e8fe7ac (diff) | |
download | bazelbuild-rules_android-cf1903cf5c87759121c4d2fe9392e337046be8cc.tar.gz |
Merge remote-tracking branch 'aosp/upstream-pre-alpha' into mergeUpstream am: dac61f349d am: ae03d131fe am: a59fc225f8android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/external/bazelbuild-rules_android/+/1646589
Change-Id: I5a2b33b1ab8b8b696e26daab6719932011df6519
-rw-r--r-- | toolchains/android/BUILD | 7 | ||||
-rw-r--r-- | toolchains/android_sdk/BUILD | 5 | ||||
-rw-r--r-- | tools/android/BUILD | 14 | ||||
-rw-r--r-- | tools/android/defs.bzl | 15 |
4 files changed, 37 insertions, 4 deletions
diff --git a/toolchains/android/BUILD b/toolchains/android/BUILD index 6c731a9..3741ee8 100644 --- a/toolchains/android/BUILD +++ b/toolchains/android/BUILD @@ -12,7 +12,10 @@ filegroup( ) # Android Toolchain Type -toolchain_type(name = "toolchain_type") +toolchain_type( + name = "toolchain_type", + visibility = ["//visibility:public"], +) # Default Android Toolchain android_toolchain( @@ -44,9 +47,11 @@ EOF sh_binary( name = "zip", srcs = [":zip.sh"], + visibility = ["//visibility:public"], ) sh_binary( name = "unzip", srcs = [":unzip.sh"], + visibility = ["//visibility:public"], ) diff --git a/toolchains/android_sdk/BUILD b/toolchains/android_sdk/BUILD index 10e40ca..d675cbe 100644 --- a/toolchains/android_sdk/BUILD +++ b/toolchains/android_sdk/BUILD @@ -9,7 +9,10 @@ filegroup( ) # Android SDK Toolchain Type -toolchain_type(name = "toolchain_type") +toolchain_type( + name = "toolchain_type", + visibility = ["//visibility:public"], +) toolchain( name = "android_sdk_tools", diff --git a/tools/android/BUILD b/tools/android/BUILD index c0f554c..7c33f67 100644 --- a/tools/android/BUILD +++ b/tools/android/BUILD @@ -8,6 +8,18 @@ android_jar( # TODO(b/175833857): This is a stub, should remove. alias( name = "merge_manifests", - actual = "@androidsdk//:fail", + actual = ":fail", visibility = ["//visibility:public"], ) + +genrule( + name = "gen_fail", + outs = ["fail.sh"], + cmd = "echo 'exit 1' > $@", + executable = 1, +) + +sh_binary( + name = "fail", + srcs =[":fail.sh"], +) diff --git a/tools/android/defs.bzl b/tools/android/defs.bzl index 6aa1896..07c7a13 100644 --- a/tools/android/defs.bzl +++ b/tools/android/defs.bzl @@ -21,7 +21,20 @@ def _android_jar_impl(ctx): android_jar = rule( implementation = _android_jar_impl, + # TODO: Should use a toolchain instead of a configuration_field on + # --android_sdk as below, however that appears to be broken when used + # from an local_repository: b/183060658. + #toolchains = [ + # "//toolchains/android_sdk:toolchain_type", + #], attrs = { - "_sdk": attr.label(default = "@androidsdk//:sdk"), + "_sdk": attr.label( + allow_rules = ["android_sdk"], + default = configuration_field( + fragment = "android", + name = "android_sdk_label", + ), + providers = [AndroidSdkInfo], + ), }, ) |