From cc12d90753228d11d6d23ad00faa90f6c2df3235 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Fri, 14 May 2021 20:15:55 +0900 Subject: [PATCH] Fix missing headers for vndk snapshotted libc VNDK snapshot depends on addExportedGeneratedHeaders to grab generated headers. This change adds a missing addExportedGeneratedHeaders call to make libc's headers captured correctly. Bug: 181326838 Test: VNDK_SNAPSHOT_BUILD_ARTIFACTS=true m dist vndk && unzip -l out/dist/*.zip Change-Id: Iaa89b5255c836761a26c77bb27f35f768f49039e --- cc/library.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cc/library.go b/cc/library.go index c5ff9b1f4..1ba359758 100644 --- a/cc/library.go +++ b/cc/library.go @@ -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) {