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

Merge "Fix missing headers for vndk snapshotted libc" am: 054619d198 am: a1ae5530cb

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

Change-Id: I5eac5b7651afc447f706067f9f2dfe47508d2278
This commit is contained in:
Bill Peckham
2021-05-14 17:50:58 +00:00
committed by Automerger Merge Worker
parent 690de6069b a1ae5530cb
commit 94f308c04a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/library.go
View File

@@ -1426,11 +1426,10 @@ func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, objs Objec
}
}
func processLLNDKHeaders(ctx ModuleContext, srcHeaderDir string, outDir android.ModuleGenPath) android.Path {
func processLLNDKHeaders(ctx ModuleContext, srcHeaderDir string, outDir android.ModuleGenPath) (timestamp android.Path, installPaths android.WritablePaths) {
srcDir := android.PathForModuleSrc(ctx, srcHeaderDir)
srcFiles := ctx.GlobFiles(filepath.Join(srcDir.String(), "**/*.h"), nil)
var installPaths []android.WritablePath
for _, header := range srcFiles {
headerDir := filepath.Dir(header.String())
relHeaderDir, err := filepath.Rel(srcDir.String(), headerDir)
@@ -1443,7 +1442,7 @@ func processLLNDKHeaders(ctx ModuleContext, srcHeaderDir string, outDir android.
installPaths = append(installPaths, outDir.Join(ctx, relHeaderDir, header.Base()))
}
return processHeadersWithVersioner(ctx, srcDir, outDir, srcFiles, installPaths)
return processHeadersWithVersioner(ctx, srcDir, outDir, srcFiles, installPaths), installPaths
}
// link registers actions to link this library, and sets various fields
@@ -1459,7 +1458,9 @@ func (library *libraryDecorator) link(ctx ModuleContext,
var timestampFiles android.Paths
for _, dir := range library.Properties.Llndk.Export_preprocessed_headers {
timestampFiles = append(timestampFiles, processLLNDKHeaders(ctx, dir, genHeaderOutDir))
timestampFile, installPaths := processLLNDKHeaders(ctx, dir, genHeaderOutDir)
timestampFiles = append(timestampFiles, timestampFile)
library.addExportedGeneratedHeaders(installPaths.Paths()...)
}
if Bool(library.Properties.Llndk.Export_headers_as_system) {