diff options
| author | Romain Jobredeaux <jobredeaux@google.com> | 2023-10-09 20:02:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-09 20:02:08 +0000 |
| commit | 9e965d6fece27a77de5377433c2f7e6999b8cc0b (patch) | |
| tree | a58049c9682d6fd38e8408479340bf3911b87515 /rules/android_library/impl.bzl | |
| parent | 8d58e75763b3b83025a5d9402750b2033e184474 (diff) | |
| parent | 2cec01026035db73c124100fa37115758f43e603 (diff) | |
| download | bazelbuild-rules_android-master.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 39292a3354 am: 3956589553 am: c86e585873 am: fcbd2d1e8b am: 2cec010260HEADandroid-14.0.0_r51android-14.0.0_r50mastermainandroid14-qpr3-release
Original change: https://android-review.googlesource.com/c/platform/external/bazelbuild-rules_android/+/2777173
Change-Id: Ie236d2ec96dd9c2a4450131f4094623c8d3df462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'rules/android_library/impl.bzl')
| -rw-r--r-- | rules/android_library/impl.bzl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/android_library/impl.bzl b/rules/android_library/impl.bzl index 5fd5af5..6ccc5a5 100644 --- a/rules/android_library/impl.bzl +++ b/rules/android_library/impl.bzl @@ -133,7 +133,7 @@ def _process_manifest(ctx, **unused_ctxs): manifest_ctx = _resources.bump_min_sdk( ctx, manifest = ctx.file.manifest, - floor = _resources.DEPOT_MIN_SDK_FLOOR if acls.in_enforce_min_sdk_floor_rollout(str(ctx.label)) else 0, + floor = acls.get_min_sdk_floor(str(ctx.label)), enforce_min_sdk_floor_tool = get_android_toolchain(ctx).enforce_min_sdk_floor_tool.files_to_run, ) |