From f7542544d2544597d36d80bcc22f610f3a41a03b Mon Sep 17 00:00:00 2001 From: Jeff Gaston Date: Wed, 28 Feb 2018 14:07:56 -0500 Subject: [PATCH] Remove unused property Bug: 72552085 Test: androidmk prebuilts/sdk/current/support/Android.mk \ | grep LOCAL_UNINSTALLABLE_MODULE && echo failed Change-Id: Idcdd571812594599267985dfef2cc2fc6efbb5ba --- bpfix/bpfix/bpfix.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/bpfix/bpfix/bpfix.go b/bpfix/bpfix/bpfix.go index 2358f0cf9..84454907b 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 +}