aboutsummaryrefslogtreecommitdiffstats
path: root/bpfix
diff options
context:
space:
mode:
Diffstat (limited to 'bpfix')
-rw-r--r--bpfix/bpfix/bpfix.go13
1 files changed, 13 insertions, 0 deletions
diff --git a/bpfix/bpfix/bpfix.go b/bpfix/bpfix/bpfix.go
index 2358f0cf..84454907 100644
--- a/bpfix/bpfix/bpfix.go
+++ b/bpfix/bpfix/bpfix.go
@@ -130,6 +130,9 @@ func rewriteIncorrectAndroidmkPrebuilts(tree *parser.File) error {
case ".aar":
renameProperty(mod, "srcs", "aars")
mod.Type = "android_library_import"
+
+ // An android_library_import doesn't get installed, so setting "installable = false" isn't supported
+ removeProperty(mod, "installable")
}
}
@@ -195,3 +198,13 @@ func renameProperty(mod *parser.Module, from, to string) {
}
}
}
+
+func removeProperty(mod *parser.Module, propertyName string) {
+ newList := make([]*parser.Property, 0, len(mod.Properties))
+ for _, prop := range mod.Properties {
+ if prop.Name != propertyName {
+ newList = append(newList, prop)
+ }
+ }
+ mod.Properties = newList
+}