diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-10 01:06:58 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-10 01:06:58 +0000 |
| commit | 91f5a4960f3c73a5e59b27bcc2f8ee4c31b08fc8 (patch) | |
| tree | a58049c9682d6fd38e8408479340bf3911b87515 /rules/android_local_test/impl.bzl | |
| parent | bc67c32f96ccf8d0c503a88cbbf7b7ae91559be3 (diff) | |
| parent | 9e965d6fece27a77de5377433c2f7e6999b8cc0b (diff) | |
| download | bazelbuild-rules_android-android14-qpr2-s1-release.tar.gz | |
Snap for 10923648 from 9e965d6fece27a77de5377433c2f7e6999b8cc0b to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Change-Id: Ic28eeddca3097c154d1283e0670dc1c497bfc08b
Diffstat (limited to 'rules/android_local_test/impl.bzl')
| -rw-r--r-- | rules/android_local_test/impl.bzl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rules/android_local_test/impl.bzl b/rules/android_local_test/impl.bzl index 1606e18..3a6221f 100644 --- a/rules/android_local_test/impl.bzl +++ b/rules/android_local_test/impl.bzl @@ -61,7 +61,7 @@ def _process_manifest(ctx, java_package, **_unused_sub_ctxs): manifest_values = resources.process_manifest_values( ctx, ctx.attr.manifest_values, - resources.DEPOT_MIN_SDK_FLOOR, + acls.get_min_sdk_floor(str(ctx.label)), ) if ctx.file.manifest == None: # No manifest provided, generate one @@ -70,7 +70,7 @@ def _process_manifest(ctx, java_package, **_unused_sub_ctxs): ctx, out_manifest = manifest, java_package = java_package, - min_sdk_version = manifest_values.get("minSdkVersion", 16), # minsdk supported by robolectric framework + min_sdk_version = int(manifest_values.get("minSdkVersion", 16)), # minsdk supported by robolectric framework ) manifest_ctx = struct(processed_manifest = manifest, processed_manifest_values = manifest_values) else: @@ -78,7 +78,7 @@ def _process_manifest(ctx, java_package, **_unused_sub_ctxs): ctx, manifest = ctx.file.manifest, manifest_values = ctx.attr.manifest_values, - 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, ) |