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

Commit 7b0781d1 authored Nov 03, 2021 by Ivan Lozano

rust: Emit toc files for cdylibs

Write toc files that list the exported symbols so dependents are
only rebuilt if the exported symbols change.

This exports the CC function TransformSharedObjectToToc, and also
removes an unused arg from its signature.

Bug: 178185435
Test: New Soong test passes.
Test: m <toc file path>
Change-Id: I7ab69bf7e7f32f25eb4c7ca9d18d877dac1511db

parent a3bd9639

cc/builder.go

+1 −2

Original line number	Diff line number	Diff line
		@@ -949,8 +949,7 @@ func sourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceD
		}

		// Generate a rule for extracting a table of contents from a shared library (.so)
		func transformSharedObjectToToc(ctx android.ModuleContext, inputFile android.Path,
		outputFile android.WritablePath, flags builderFlags) {
		func TransformSharedObjectToToc(ctx android.ModuleContext, inputFile android.Path, outputFile android.WritablePath) {

		var format string
		if ctx.Darwin() {

cc/library.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -1377,7 +1377,7 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext,
		// depending on a table of contents file instead of the library itself.
		tocFile := outputFile.ReplaceExtension(ctx, flags.Toolchain.ShlibSuffix()[1:]+".toc")
		library.tocFile = android.OptionalPathForPath(tocFile)
		transformSharedObjectToToc(ctx, outputFile, tocFile, builderFlags)
		TransformSharedObjectToToc(ctx, outputFile, tocFile)

		stripFlags := flagsToStripFlags(flags)
		needsStrip := library.stripper.NeedsStrip(ctx)

cc/prebuilt.go

+1 −3

Original line number	Diff line number	Diff line
		@@ -114,8 +114,6 @@ func (p *prebuiltLibraryLinker) link(ctx ModuleContext,
		// TODO(ccross): verify shared library dependencies
		srcs := p.prebuiltSrcs(ctx)
		if len(srcs) > 0 {
		builderFlags := flagsToBuilderFlags(flags)

		if len(srcs) > 1 {
		ctx.PropertyErrorf("srcs", "multiple prebuilt source files")
		return nil
		@@ -152,7 +150,7 @@ func (p *prebuiltLibraryLinker) link(ctx ModuleContext,
		// depending on a table of contents file instead of the library itself.
		tocFile := android.PathForModuleOut(ctx, libName+".toc")
		p.tocFile = android.OptionalPathForPath(tocFile)
		transformSharedObjectToToc(ctx, outputFile, tocFile, builderFlags)
		TransformSharedObjectToToc(ctx, outputFile, tocFile)

		if ctx.Windows() && p.properties.Windows_import_lib != nil {
		// Consumers of this library actually links to the import library in build

cc/snapshot_prebuilt.go

+1 −2

Original line number	Diff line number	Diff line
		@@ -476,13 +476,12 @@ func (p *snapshotLibraryDecorator) link(ctx ModuleContext, flags Flags, deps Pat

		if p.shared() {
		libName := in.Base()
		builderFlags := flagsToBuilderFlags(flags)

		// Optimize out relinking against shared libraries whose interface hasn't changed by
		// depending on a table of contents file instead of the library itself.
		tocFile := android.PathForModuleOut(ctx, libName+".toc")
		p.tocFile = android.OptionalPathForPath(tocFile)
		transformSharedObjectToToc(ctx, in, tocFile, builderFlags)
		TransformSharedObjectToToc(ctx, in, tocFile)

		ctx.SetProvider(SharedLibraryInfoProvider, SharedLibraryInfo{
		SharedLibrary: in,

cc/vndk_prebuilt.go

+1 −2

Original line number	Diff line number	Diff line
		@@ -144,7 +144,6 @@ func (p *vndkPrebuiltLibraryDecorator) link(ctx ModuleContext,
		// current VNDK prebuilts are only shared libs.

		in := p.singleSourcePath(ctx)
		builderFlags := flagsToBuilderFlags(flags)
		p.unstrippedOutputFile = in
		libName := in.Base()
		if p.stripper.NeedsStrip(ctx) {
		@@ -158,7 +157,7 @@ func (p *vndkPrebuiltLibraryDecorator) link(ctx ModuleContext,
		// depending on a table of contents file instead of the library itself.
		tocFile := android.PathForModuleOut(ctx, libName+".toc")
		p.tocFile = android.OptionalPathForPath(tocFile)
		transformSharedObjectToToc(ctx, in, tocFile, builderFlags)
		TransformSharedObjectToToc(ctx, in, tocFile)

		p.androidMkSuffix = p.NameSuffix()