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

Rename nativeLibInfoProperties.archType to archSubDir am: 96f1832762 am: 9f266a87a8 am: 5554ca9d07

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826227

Change-Id: I8412bf89783c1e51117e802dc668238b71f2f4f7
This commit is contained in:
Paul Duffin
2021-09-16 00:39:12 +00:00
committed by Automerger Merge Worker
parent f3f17d366e 5554ca9d07
commit 1fc4adead6
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cc/library_sdk_member.go
View File

@@ -265,8 +265,8 @@ func addPossiblyArchSpecificProperties(sdkModuleContext android.ModuleContext, b
// values where necessary.
for _, propertyInfo := range includeDirProperties {
// Calculate the base directory in the snapshot into which the files will be copied.
// lib.archType is "" for common properties.
targetDir := filepath.Join(libInfo.OsPrefix(), libInfo.archType, propertyInfo.snapshotDir)
// lib.archSubDir is "" for common properties.
targetDir := filepath.Join(libInfo.OsPrefix(), libInfo.archSubDir, propertyInfo.snapshotDir)
propertyName := propertyInfo.propertyName
@@ -334,7 +334,7 @@ const (
// path to the native library. Relative to <sdk_root>/<api_dir>
func nativeLibraryPathFor(lib *nativeLibInfoProperties) string {
return filepath.Join(lib.OsPrefix(), lib.archType,
return filepath.Join(lib.OsPrefix(), lib.archSubDir,
nativeStubDir, lib.outputFile.Base())
}
@@ -347,9 +347,12 @@ type nativeLibInfoProperties struct {
memberType *librarySdkMemberType
// archType is not exported as if set (to a non default value) it is always arch specific.
// This is "" for common properties.
archType string
// archSubDir is the subdirectory within the OS directory in the sdk snapshot into which arch
// specific files will be copied.
//
// It is not exported since any value other than "" is always going to be arch specific.
// This is "" for non-arch specific common properties.
archSubDir string
// The list of possibly common exported include dirs.
//
@@ -433,7 +436,7 @@ func (p *nativeLibInfoProperties) PopulateFromVariant(ctx android.SdkMemberConte
exportedIncludeDirs, exportedGeneratedIncludeDirs := android.FilterPathListPredicate(
exportedInfo.IncludeDirs, isGeneratedHeaderDirectory)
p.archType = ccModule.Target().Arch.ArchType.String()
p.archSubDir = ccModule.Target().Arch.ArchType.String()
// Make sure that the include directories are unique.
p.ExportedIncludeDirs = android.FirstUniquePaths(exportedIncludeDirs)