Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc12d907 authored by Inseob Kim's avatar Inseob Kim
Browse files

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
parent 001e606e

cc/library.go

+5 −4
Original line number Diff line number Diff line
@@ -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) {