diff options
| author | 2020-09-29 13:59:05 +0000 | |
|---|---|---|
| committer | 2020-09-29 13:59:05 +0000 | |
| commit | b7c77bd889508b948a762e439bcc9abb8cca3c59 (patch) | |
| tree | 8ee899ef2c94ff03cedde07c85dd4ee4f2bc11e6 /cc | |
| parent | 41b0876c10708f4fa858efc75bdd64f1c79a9bf4 (diff) | |
| parent | 618b671bf40a5b3240b83e0e645a8ce35945c4ff (diff) | |
Merge "Retain all stubs versions in the snapshot."
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/library_sdk_member.go | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/cc/library_sdk_member.go b/cc/library_sdk_member.go index a1de84bc5..41ce29422 100644 --- a/cc/library_sdk_member.go +++ b/cc/library_sdk_member.go @@ -292,9 +292,9 @@ func addPossiblyArchSpecificProperties(sdkModuleContext android.ModuleContext, b outputProperties.AddProperty(property, includeDirs[property]) } - if len(libInfo.StubsVersion) > 0 { + if len(libInfo.StubsVersions) > 0 { stubsSet := outputProperties.AddPropertySet("stubs") - stubsSet.AddProperty("versions", []string{libInfo.StubsVersion}) + stubsSet.AddProperty("versions", libInfo.StubsVersions) } } @@ -365,10 +365,10 @@ type nativeLibInfoProperties struct { // The specific stubs version for the lib variant, or empty string if stubs // are not in use. // - // Marked 'ignored-on-host' as the StubsVersion() from which this is initialized is - // not set on host and the stubs.versions property which this is written to is does - // not vary by arch so cannot be android specific. - StubsVersion string `sdk:"ignored-on-host"` + // Marked 'ignored-on-host' as the AllStubsVersions() from which this is + // initialized is not set on host and the stubs.versions property which this + // is written to does not vary by arch so cannot be android specific. + StubsVersions []string `sdk:"ignored-on-host"` // Value of SanitizeProperties.Sanitize. Several - but not all - of these // affect the expanded variants. All are propagated to avoid entangling the @@ -419,7 +419,11 @@ func (p *nativeLibInfoProperties) PopulateFromVariant(ctx android.SdkMemberConte p.exportedGeneratedHeaders = ccModule.ExportedGeneratedHeaders() if ccModule.HasStubsVariants() { - p.StubsVersion = ccModule.StubsVersion() + // TODO(b/169373910): 1. Only output the specific version (from + // ccModule.StubsVersion()) if the module is versioned. 2. Ensure that all + // the versioned stub libs are retained in the prebuilt tree; currently only + // the stub corresponding to ccModule.StubsVersion() is. + p.StubsVersions = ccModule.AllStubsVersions() } if ccModule.sanitize != nil { |