openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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

Change-Id: I7aa49e3be1ca027ef6a16c8cd3c1b378eb512575
This commit is contained in:
Bill Peckham 2021-05-14 18:21:23 +00:00 committed by Automerger Merge Worker
parent 25c60df217 94f308c04a
commit a7eec840cc
1 changed files with 5 additions and 4 deletions
Show Stats 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) srcDir := android.PathForModuleSrc(ctx, srcHeaderDir)
srcFiles := ctx.GlobFiles(filepath.Join(srcDir.String(), "**/*.h"), nil) srcFiles := ctx.GlobFiles(filepath.Join(srcDir.String(), "**/*.h"), nil)
var installPaths []android.WritablePath
for _, header := range srcFiles { for _, header := range srcFiles {
headerDir := filepath.Dir(header.String()) headerDir := filepath.Dir(header.String())
relHeaderDir, err := filepath.Rel(srcDir.String(), headerDir) 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())) 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 // 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 var timestampFiles android.Paths
for _, dir := range library.Properties.Llndk.Export_preprocessed_headers { 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) { if Bool(library.Properties.Llndk.Export_headers_as_system) {