aboutsummaryrefslogtreecommitdiff
path: root/rules/android_local_test/impl.bzl
diff options
context:
space:
mode:
Diffstat (limited to 'rules/android_local_test/impl.bzl')
-rw-r--r--rules/android_local_test/impl.bzl6
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,
)