Merge "Remove unused property" am: 491ace3c0a

am: 3181870d1f

Change-Id: I80c062106d0ab7cc233ded84cc084e5999b1f739

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
+}