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

Commit bdd0dffc authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Do not propagate the stub symbol file to prebuilts. 

This partially reverts https://r.android.com/1278193. The propagated
symbol files contain all versions, even though only one is applicable
in a given SDK snapshot.

It's uncertain what repercussions this might have, but one is that if
we were to update a snapshot for a fixed version then it might change
because the symbol file contains new versions that aren't applicable.
Since the symbol file isn't actually needed at this point it's better
to wait with this step until the use cases for it are more clear.

Test: m nothing
Test: Create an SDK snapshot with Bionic libs, drop it into a
  master-art tree without bionic/ in it, build ART APEXes, and check
  that the Soong phase completes (specifically that the stubs are
  detected even without symbol files).
Bug: 152481980
Change-Id: Ic79f89bc6d11d0b6552fa20791f5680ff9a40c0d
parent dd22225b

cc/cc.go

+0 −7
Original line number Diff line number Diff line
@@ -586,13 +586,6 @@ func (c *Module) GetDepsInLinkOrder() []android.Path { 
	return c.depsInLinkOrder

}



func (c *Module) StubsSymbolFile() android.OptionalPath {

	if library, ok := c.linker.(*libraryDecorator); ok {

		return library.stubsSymbolFile

	}

	return android.OptionalPath{}

}



func (c *Module) StubsVersions() []string {

	if c.linker != nil {

		if library, ok := c.linker.(*libraryDecorator); ok {

cc/library.go

+0 −4
Original line number Diff line number Diff line
@@ -367,9 +367,6 @@ type libraryDecorator struct { 
	// Location of the file that should be copied to dist dir when requested

	distFile android.OptionalPath



	// stubs.symbol_file

	stubsSymbolFile android.OptionalPath



	versionScriptPath android.ModuleGenPath



	post_install_cmds []string
@@ -606,7 +603,6 @@ func (library *libraryDecorator) shouldCreateSourceAbiDump(ctx ModuleContext) bo 


func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps PathDeps) Objects {

	if library.buildStubs() {

		library.stubsSymbolFile = android.OptionalPathForModuleSrc(ctx, library.Properties.Stubs.Symbol_file)

		objs, versionScript := compileStubLibrary(ctx, flags, String(library.Properties.Stubs.Symbol_file), library.MutatedProperties.StubsVersion, "--apex")

		library.versionScriptPath = versionScript

		return objs

cc/library_sdk_member.go

+0 −8
Original line number Diff line number Diff line
@@ -271,10 +271,7 @@ func addPossiblyArchSpecificProperties(sdkModuleContext android.ModuleContext, b 
	}



	if len(libInfo.StubsVersion) > 0 {

		symbolFilePath := filepath.Join(nativeEtcDir, libInfo.StubsSymbolFile.Path().Base())

		builder.CopyToSnapshot(libInfo.StubsSymbolFile.Path(), symbolFilePath)

		stubsSet := outputProperties.AddPropertySet("stubs")

		stubsSet.AddProperty("symbol_file", symbolFilePath)

		stubsSet.AddProperty("versions", []string{libInfo.StubsVersion})

	}

}
@@ -283,7 +280,6 @@ const ( 
	nativeIncludeDir          = "include"

	nativeGeneratedIncludeDir = "include_gen"

	nativeStubDir             = "lib"

	nativeEtcDir              = "etc"

)



// path to the native library. Relative to <sdk_root>/<api_dir>
@@ -348,9 +344,6 @@ type nativeLibInfoProperties struct { 
	// are not in use.

	StubsVersion string



	// The stubs symbol file.

	StubsSymbolFile android.OptionalPath



	// outputFile is not exported as it is always arch specific.

	outputFile android.Path

}
@@ -389,7 +382,6 @@ func (p *nativeLibInfoProperties) PopulateFromVariant(ctx android.SdkMemberConte 


	if ccModule.HasStubsVariants() {

		p.StubsVersion = ccModule.StubsVersion()

		p.StubsSymbolFile = ccModule.StubsSymbolFile()

	}

}

sdk/cc_sdk_test.go

+0 −2
Original line number Diff line number Diff line
@@ -1766,7 +1766,6 @@ cc_prebuilt_library_shared { 
    sdk_member_name: "stubslib",

    installable: false,

    stubs: {

        symbol_file: "etc/stubslib.map.txt",

        versions: ["3"],

    },

    arch: {
@@ -1783,7 +1782,6 @@ cc_prebuilt_library_shared { 
    name: "stubslib",

    prefer: false,

    stubs: {

        symbol_file: "etc/stubslib.map.txt",

        versions: ["3"],

    },

    arch: {