diff options
| author | Alix <agespino@google.com> | 2023-03-21 18:05:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-21 18:05:05 +0000 |
| commit | ac446ef145482f4c963f40ee86e32c55903c5d3a (patch) | |
| tree | 4ef773989c2e70b55a12a9d8e57d02ed3a85863a | |
| parent | 2d03939b6d9eb3088dca19c0201923b53b7da6fb (diff) | |
| parent | 386c33b5a9af4199a3307d2748977875f00fa223 (diff) | |
| download | bazelbuild-rules_android-ac446ef145482f4c963f40ee86e32c55903c5d3a.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-pre-alpha' into aosp am: 386c33b5a9
Original change: https://android-review.googlesource.com/c/platform/external/bazelbuild-rules_android/+/2498135
Change-Id: I8330ec5afa0666842b6ebb984c773de1d9d6f1bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | METADATA | 4 | ||||
| -rw-r--r-- | rules/resources.bzl | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -12,7 +12,7 @@ third_party { type: GIT value: "https://github.com/bazelbuild/rules_android" } - version: "ab13c86fafc79b965b7ad6e4d91c821760d869d3" - last_upgrade_date { year: 2023 month: 3 day: 17 } + version: "a51e0d5a49ebdc5051c1eca467272d794aaf6d42" + last_upgrade_date { year: 2023 month: 3 day: 20 } license_type: NOTICE } diff --git a/rules/resources.bzl b/rules/resources.bzl index 93a66a5..ff97c5c 100644 --- a/rules/resources.bzl +++ b/rules/resources.bzl @@ -1845,7 +1845,7 @@ resources = struct( bump_min_sdk = _bump_min_sdk, # Exposed for use in AOSP - set_default_sdk = _set_default_min_sdk, + set_default_min_sdk = _set_default_min_sdk, # Exposed for android_binary validate_min_sdk = _validate_min_sdk, |