diff options
author | Jeff Gaston <jeffrygaston@google.com> | 2018-03-01 16:14:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-01 16:14:03 +0000 |
commit | 491ace3c0abf3145999eaf7540623bf56efc1d3a (patch) | |
tree | 95e2fc97a63fc1ca8e945c3077a344dbc09a2a2a | |
parent | 8d43b7cf8169721d85330bea5de28db66667426e (diff) | |
parent | f7542544d2544597d36d80bcc22f610f3a41a03b (diff) | |
download | build_soong-491ace3c0abf3145999eaf7540623bf56efc1d3a.tar.gz build_soong-491ace3c0abf3145999eaf7540623bf56efc1d3a.tar.bz2 build_soong-491ace3c0abf3145999eaf7540623bf56efc1d3a.zip |
Merge "Remove unused property"
-rw-r--r-- | bpfix/bpfix/bpfix.go | 13 |
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 +} |