Make installable arch-variant and static vs shared variant for cc modules

libc's native_bridge shared variant needs to be installable: false,
make the installable property arch-variant and allow the static and
shared clauses to override it.

This relands I8e0eaed2169e89520b07bb0326bb97ac0b4a70ac with fixes to
allow only the shared variant to be marked installable: false.

Bug: 204136549
Test: m checkbuild
Change-Id: Ie579b5ba56ca21f4d9243088afd5078d8c122a68
This commit is contained in:
Colin Cross
2021-10-28 13:25:54 -07:00
parent 215ed178dd
commit 1bc9412fb3
3 changed files with 21 additions and 3 deletions

View File

@@ -123,7 +123,7 @@ func IsValidSharedDependency(dependency android.Module) bool {
}
// Discard installable:false libraries because they are expected to be absent
// in runtime.
if !proptools.BoolDefault(ccLibrary.Properties.Installable, true) {
if !proptools.BoolDefault(ccLibrary.Installable(), true) {
return false
}
}