commit aceec25d3f27f2f871965bbc30098ec96da80eb3
author Liz Kammer <eakammer@google.com> Fri Mar 24 09:46:36 2023 -0400
committer Liz Kammer <eakammer@google.com> Fri Mar 24 13:08:42 2023 -0400
tree 177a399fb038ac5fbb039aa11b1522cd3127ddf6
parent a137aa2e6e6670f0521e22369a927e6f619080f9

Add apex_available for static/shared only props

Test: b build com.android.neuralnetworks com.android.media.swcodec
Change-Id: I492c61d60d29a7a441d709ac4315a5ed2288960d

cc/library.go

diff --git a/cc/library.go b/cc/library.go
index 1b579cd..31b76cd 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -428,8 +428,10 @@
 	if compilerAttrs.stubsSymbolFile == nil && len(compilerAttrs.stubsVersions.Value) == 0 {
 		tagsForStaticVariant = android.ApexAvailableTags(m)
 	}
+	tagsForStaticVariant.Append(bazel.StringListAttribute{Value: staticAttrs.Apex_available})
 
 	tagsForSharedVariant := android.ApexAvailableTags(m)
+	tagsForSharedVariant.Append(bazel.StringListAttribute{Value: sharedAttrs.Apex_available})
 
 	ctx.CreateBazelTargetModuleWithRestrictions(staticProps,
 		android.CommonAttributes{