1 files changed, 9 insertions, 8 deletions
diff --git a/rules/android_application/android_feature_module_rule.bzl b/rules/android_application/android_feature_module_rule.bzl
index 3041656..a0f7d2b 100644
--- a/rules/android_application/android_feature_module_rule.bzl
+++ b/rules/android_application/android_feature_module_rule.bzl
@@ -15,15 +15,16 @@
 """android_feature_module rule."""
 
 load(":attrs.bzl", "ANDROID_FEATURE_MODULE_ATTRS")
-load("@rules_android//rules:java.bzl", _java = "java")
+load("//rules:java.bzl", _java = "java")
 load(
-    "@rules_android//rules:providers.bzl",
+    "//rules:providers.bzl",
     "AndroidFeatureModuleInfo",
 )
-load("@rules_android//rules:acls.bzl", "acls")
+load("//rules:acls.bzl", "acls")
 load(
-    "@rules_android//rules:utils.bzl",
+    "//rules:utils.bzl",
     "get_android_toolchain",
+    "utils",
 )
 
 def _impl(ctx):
@@ -39,7 +40,7 @@ def _impl(ctx):
     args.add(ctx.attr.binary[ApkInfo].unsigned_apk.path)
     args.add(ctx.configuration.coverage_enabled)
     args.add(ctx.fragments.android.desugar_java8_libs)
-    args.add(ctx.attr.library.label)
+    args.add(utils.dedupe_split_attr(ctx.split_attr.library).label)
     args.add(get_android_toolchain(ctx).xmllint_tool.files_to_run.executable)
     args.add(get_android_toolchain(ctx).unzip_tool.files_to_run.executable)
 
@@ -59,7 +60,7 @@ def _impl(ctx):
     return [
         AndroidFeatureModuleInfo(
             binary = ctx.attr.binary,
-            library = ctx.attr.library,
+            library = utils.dedupe_split_attr(ctx.split_attr.library),
             title_id = ctx.attr.title_id,
             title_lib = ctx.attr.title_lib,
             feature_name = ctx.attr.feature_name,
@@ -77,7 +78,7 @@ android_feature_module = rule(
     ],
     implementation = _impl,
     provides = [AndroidFeatureModuleInfo],
-    toolchains = ["@rules_android//toolchains/android:toolchain_type"],
+    toolchains = ["//toolchains/android:toolchain_type"],
     _skylark_testable = True,
 )
 
@@ -140,7 +141,7 @@ EOF
     )
 
     # Create AndroidManifest.xml
-    min_sdk_version = getattr(attrs, "min_sdk_version", "14") or "14"
+    min_sdk_version = getattr(attrs, "min_sdk_version", "21") or "21"
     package = _java.resolve_package_from_label(Label(fqn), getattr(attrs, "custom_package", None))
     native.genrule(
         name = targets.manifest_lib.name,