StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dedup adding of arch/common properties to cc library snapshot" am: 26a6eb7971 am: af3948b120

Browse Source 
Change-Id: I93faf41f5a91555016b169b9c74797015d23e698
This commit is contained in:
Automerger Merge Worker
2020-02-04 23:17:47 +00:00
parent 8b2df375bb af3948b120
commit f14a1746e5
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
cc/library_sdk_member.go
View File

@@ -241,39 +241,43 @@ func buildSharedNativeLibSnapshot(sdkModuleContext android.ModuleContext, info *
func (info *nativeLibInfo) generatePrebuiltLibrary(sdkModuleContext android.ModuleContext, builder android.SnapshotBuilder, member android.SdkMember) { func (info *nativeLibInfo) generatePrebuiltLibrary(sdkModuleContext android.ModuleContext, builder android.SnapshotBuilder, member android.SdkMember) {
// a function for emitting include dirs
addExportedDirsForNativeLibs := func(lib nativeLibInfoProperties, properties android.BpPropertySet, systemInclude bool) {
includeDirs := nativeIncludeDirPathsFor(lib, systemInclude)
if len(includeDirs) == 0 {
return
}
var propertyName string
if !systemInclude {
propertyName = "export_include_dirs"
} else {
propertyName = "export_system_include_dirs"
}
properties.AddProperty(propertyName, includeDirs)
}
pbm := builder.AddPrebuiltModule(member, info.memberType.prebuiltModuleType) pbm := builder.AddPrebuiltModule(member, info.memberType.prebuiltModuleType)
addExportedDirsForNativeLibs(info.commonProperties, pbm, false /*systemInclude*/) addPossiblyArchSpecificProperties(info.commonProperties, pbm)
addExportedDirsForNativeLibs(info.commonProperties, pbm, true /*systemInclude*/)
archProperties := pbm.AddPropertySet("arch") archProperties := pbm.AddPropertySet("arch")
for _, av := range info.archVariantProperties { for _, av := range info.archVariantProperties {
archTypeProperties := archProperties.AddPropertySet(av.archType) archTypeProperties := archProperties.AddPropertySet(av.archType)
// Add any arch specific properties inside the appropriate arch: {<arch>: {...}} block
archTypeProperties.AddProperty("srcs", []string{nativeLibraryPathFor(av)}) archTypeProperties.AddProperty("srcs", []string{nativeLibraryPathFor(av)})
// export_* properties are added inside the arch: {<arch>: {...}} block addPossiblyArchSpecificProperties(av, archTypeProperties)
addExportedDirsForNativeLibs(av, archTypeProperties, false /*systemInclude*/)
addExportedDirsForNativeLibs(av, archTypeProperties, true /*systemInclude*/)
} }
pbm.AddProperty("stl", "none") pbm.AddProperty("stl", "none")
pbm.AddProperty("system_shared_libs", []string{}) pbm.AddProperty("system_shared_libs", []string{})
} }
// Add properties that may, or may not, be arch specific.
func addPossiblyArchSpecificProperties(libInfo nativeLibInfoProperties, outputProperties android.BpPropertySet) {
addExportedDirsForNativeLibs(libInfo, outputProperties, false /*systemInclude*/)
addExportedDirsForNativeLibs(libInfo, outputProperties, true /*systemInclude*/)
}
// a function for emitting include dirs
func addExportedDirsForNativeLibs(lib nativeLibInfoProperties, properties android.BpPropertySet, systemInclude bool) {
includeDirs := nativeIncludeDirPathsFor(lib, systemInclude)
if len(includeDirs) == 0 {
return
}
var propertyName string
if !systemInclude {
propertyName = "export_include_dirs"
} else {
propertyName = "export_system_include_dirs"
}
properties.AddProperty(propertyName, includeDirs)
}
const ( const (
nativeIncludeDir = "include" nativeIncludeDir = "include"
nativeGeneratedIncludeDir = "include_gen" nativeGeneratedIncludeDir = "include_gen"