Merge changes Idc985c52,Ibbbde323,I51417cf6,I9886498d,I195d99c9 am: 6ddb81b0db am: 14ca2fcf31 (46275c32) · Commits · e / os / android_build_soong

cc/androidmk.go

+5 −0

Original line number	Diff line number	Diff line
		@@ -442,6 +442,11 @@ func (c stubDecorator) AndroidMkEntries(ctx AndroidMkContext, entries android.
		entries.SubName = ndkLibrarySuffix + "." + c.apiLevel.String()
		entries.Class = "SHARED_LIBRARIES"

		if !c.buildStubs() {
		entries.Disabled = true
		return
		}

		entries.ExtraEntries = append(entries.ExtraEntries, func(entries *android.AndroidMkEntries) {
		path, file := filepath.Split(c.installPath.String())
		stem, suffix, _ := android.SplitFileExt(file)

cc/cc.go

+32 −105

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ func RegisterCCBuildComponents(ctx android.RegistrationContext) {
		ctx.BottomUp("sdk", sdkMutator).Parallel()
		ctx.BottomUp("vndk", VndkMutator).Parallel()
		ctx.BottomUp("link", LinkageMutator).Parallel()
		ctx.BottomUp("ndk_api", NdkApiMutator).Parallel()
		ctx.BottomUp("test_per_src", TestPerSrcMutator).Parallel()
		ctx.BottomUp("version_selector", versionSelectorMutator).Parallel()
		ctx.BottomUp("version", versionMutator).Parallel()
		@@ -718,14 +717,9 @@ func (c *Module) AlwaysSdk() bool {
		return c.Properties.AlwaysSdk \|\| Bool(c.Properties.Sdk_variant_only)
		}

		func (c *Module) StubsVersions() []string {
		if c.linker != nil {
		if library, ok := c.linker.(*libraryDecorator); ok {
		return library.Properties.Stubs.Versions
		}
		if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
		return library.Properties.Stubs.Versions
		}
		func (c *Module) StubsVersions(ctx android.BaseMutatorContext) []string {
		if versioned, ok := c.linker.(versionedInterface); ok {
		return versioned.stubsVersions(ctx)
		}
		panic(fmt.Errorf("StubsVersions called on non-library module: %q", c.BaseModuleName()))
		}
		@@ -754,100 +748,48 @@ func (c *Module) NonCcVariants() bool {
		}

		func (c *Module) SetBuildStubs() {
		if c.linker != nil {
		if library, ok := c.linker.(*libraryDecorator); ok {
		library.MutatedProperties.BuildStubs = true
		if versioned, ok := c.linker.(versionedInterface); ok {
		versioned.setBuildStubs()
		c.Properties.HideFromMake = true
		c.sanitize = nil
		c.stl = nil
		c.Properties.PreventInstall = true
		return
		}
		if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
		library.MutatedProperties.BuildStubs = true
		c.Properties.HideFromMake = true
		c.sanitize = nil
		c.stl = nil
		c.Properties.PreventInstall = true
		return
		}
		if _, ok := c.linker.(*llndkStubDecorator); ok {
		c.Properties.HideFromMake = true
		return
		}
		}
		panic(fmt.Errorf("SetBuildStubs called on non-library module: %q", c.BaseModuleName()))
		}

		func (c *Module) BuildStubs() bool {
		if c.linker != nil {
		if library, ok := c.linker.(*libraryDecorator); ok {
		return library.buildStubs()
		}
		if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
		return library.buildStubs()
		}
		if versioned, ok := c.linker.(versionedInterface); ok {
		return versioned.buildStubs()
		}
		panic(fmt.Errorf("BuildStubs called on non-library module: %q", c.BaseModuleName()))
		}

		func (c *Module) SetAllStubsVersions(versions []string) {
		if library, ok := c.linker.(*libraryDecorator); ok {
		library.MutatedProperties.AllStubsVersions = versions
		return
		}
		if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
		library.MutatedProperties.AllStubsVersions = versions
		return
		}
		if llndk, ok := c.linker.(*llndkStubDecorator); ok {
		llndk.libraryDecorator.MutatedProperties.AllStubsVersions = versions
		return
		if versioned, ok := c.linker.(versionedInterface); ok {
		versioned.setAllStubsVersions(versions)
		}
		}

		func (c *Module) AllStubsVersions() []string {
		if library, ok := c.linker.(*libraryDecorator); ok {
		return library.MutatedProperties.AllStubsVersions
		}
		if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
		return library.MutatedProperties.AllStubsVersions
		}
		if llndk, ok := c.linker.(*llndkStubDecorator); ok {
		return llndk.libraryDecorator.MutatedProperties.AllStubsVersions
		if versioned, ok := c.linker.(versionedInterface); ok {
		return versioned.allStubsVersions()
		}
		return nil
		}

		func (c *Module) SetStubsVersion(version string) {
		if c.linker != nil {
		if library, ok := c.linker.(*libraryDecorator); ok {
		library.MutatedProperties.StubsVersion = version
		return
		}
		if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
		library.MutatedProperties.StubsVersion = version
		if versioned, ok := c.linker.(versionedInterface); ok {
		versioned.setStubsVersion(version)
		return
		}
		if llndk, ok := c.linker.(*llndkStubDecorator); ok {
		llndk.libraryDecorator.MutatedProperties.StubsVersion = version
		return
		}
		}
		panic(fmt.Errorf("SetStubsVersion called on non-library module: %q", c.BaseModuleName()))
		}

		func (c *Module) StubsVersion() string {
		if c.linker != nil {
		if library, ok := c.linker.(*libraryDecorator); ok {
		return library.MutatedProperties.StubsVersion
		}
		if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
		return library.MutatedProperties.StubsVersion
		}
		if llndk, ok := c.linker.(*llndkStubDecorator); ok {
		return llndk.libraryDecorator.MutatedProperties.StubsVersion
		}
		if versioned, ok := c.linker.(versionedInterface); ok {
		return versioned.stubsVersion()
		}
		panic(fmt.Errorf("StubsVersion called on non-library module: %q", c.BaseModuleName()))
		}
		@@ -1085,22 +1027,15 @@ func (c *Module) getVndkExtendsModuleName() string {
		}

		func (c *Module) IsStubs() bool {
		if library, ok := c.linker.(*libraryDecorator); ok {
		return library.buildStubs()
		} else if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
		return library.buildStubs()
		} else if _, ok := c.linker.(*llndkStubDecorator); ok {
		return true
		if versioned, ok := c.linker.(versionedInterface); ok {
		return versioned.buildStubs()
		}
		return false
		}

		func (c *Module) HasStubsVariants() bool {
		if library, ok := c.linker.(*libraryDecorator); ok {
		return len(library.Properties.Stubs.Versions) > 0
		}
		if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
		return len(library.Properties.Stubs.Versions) > 0
		if versioned, ok := c.linker.(versionedInterface); ok {
		return versioned.hasStubsVariants()
		}
		return false
		}
		@@ -1752,7 +1687,7 @@ func GetCrtVariations(ctx android.BottomUpMutatorContext,
		if m.UseSdk() {
		return []blueprint.Variation{
		{Mutator: "sdk", Variation: "sdk"},
		{Mutator: "ndk_api", Variation: m.SdkVersion()},
		{Mutator: "version", Variation: m.SdkVersion()},
		}
		}
		return []blueprint.Variation{
		@@ -1872,18 +1807,11 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) {
		}

		buildStubs := false
		if c.linker != nil {
		if library, ok := c.linker.(*libraryDecorator); ok {
		if library.buildStubs() {
		buildStubs = true
		}
		}
		if library, ok := c.linker.(*prebuiltLibraryLinker); ok {
		if library.buildStubs() {
		if versioned, ok := c.linker.(versionedInterface); ok {
		if versioned.buildStubs() {
		buildStubs = true
		}
		}
		}

		rewriteSnapshotLibs := func(lib string, snapshotMap *snapshotMap) string {
		// only modules with BOARD_VNDK_VERSION uses snapshot.
		@@ -2025,11 +1953,10 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) {
		actx.AddDependency(c, depTag, gen)
		}

		actx.AddVariationDependencies(nil, objDepTag, deps.ObjFiles...)

		vendorSnapshotObjects := vendorSnapshotObjects(actx.Config())

		crtVariations := GetCrtVariations(ctx, c)
		actx.AddVariationDependencies(crtVariations, objDepTag, deps.ObjFiles...)
		if deps.CrtBegin != "" {
		actx.AddVariationDependencies(crtVariations, CrtBeginDepTag,
		rewriteSnapshotLibs(deps.CrtBegin, vendorSnapshotObjects))
		@@ -2049,13 +1976,13 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) {

		ndkStubDepTag := libraryDependencyTag{Kind: sharedLibraryDependency, ndk: true, makeSuffix: "." + version}
		actx.AddVariationDependencies([]blueprint.Variation{
		{Mutator: "ndk_api", Variation: version},
		{Mutator: "version", Variation: version},
		{Mutator: "link", Variation: "shared"},
		}, ndkStubDepTag, variantNdkLibs...)

		ndkLateStubDepTag := libraryDependencyTag{Kind: sharedLibraryDependency, Order: lateLibraryDependency, ndk: true, makeSuffix: "." + version}
		actx.AddVariationDependencies([]blueprint.Variation{
		{Mutator: "ndk_api", Variation: version},
		{Mutator: "version", Variation: version},
		{Mutator: "link", Variation: "shared"},
		}, ndkLateStubDepTag, variantLateNdkLibs...)

cc/library.go

+85 −28

Original line number	Diff line number	Diff line
		@@ -349,7 +349,7 @@ type libraryDecorator struct {
		// Location of the file that should be copied to dist dir when requested
		distFile android.Path

		versionScriptPath android.ModuleGenPath
		versionScriptPath android.OptionalPath

		post_install_cmds []string

		@@ -358,6 +358,8 @@ type libraryDecorator struct {
		useCoreVariant bool
		checkSameCoreVariant bool

		skipAPIDefine bool

		// Decorated interfaces
		*baseCompiler
		*baseLinker
		@@ -611,7 +613,7 @@ func (library *libraryDecorator) shouldCreateSourceAbiDump(ctx ModuleContext) bo
		func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps PathDeps) Objects {
		if library.buildStubs() {
		objs, versionScript := compileStubLibrary(ctx, flags, String(library.Properties.Stubs.Symbol_file), library.MutatedProperties.StubsVersion, "--apex")
		library.versionScriptPath = versionScript
		library.versionScriptPath = android.OptionalPathForPath(versionScript)
		return objs
		}

		@@ -661,6 +663,8 @@ func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps Pa
		}

		type libraryInterface interface {
		versionedInterface

		static() bool
		shared() bool
		objs() Objects
		@@ -681,6 +685,21 @@ type libraryInterface interface {
		availableFor(string) bool
		}

		type versionedInterface interface {
		buildStubs() bool
		setBuildStubs()
		hasStubsVariants() bool
		setStubsVersion(string)
		stubsVersion() string

		stubsVersions(ctx android.BaseMutatorContext) []string
		setAllStubsVersions([]string)
		allStubsVersions() []string
		}

		var _ libraryInterface = (*libraryDecorator)(nil)
		var _ versionedInterface = (*libraryDecorator)(nil)

		func (library *libraryDecorator) getLibNameHelper(baseModuleName string, useVndk bool) string {
		name := library.libName
		if name == "" {
		@@ -916,10 +935,10 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext,
		linkerDeps = append(linkerDeps, forceWeakSymbols.Path())
		}
		}
		if library.buildStubs() {
		if library.versionScriptPath.Valid() {
		linkerScriptFlags := "-Wl,--version-script," + library.versionScriptPath.String()
		flags.Local.LdFlags = append(flags.Local.LdFlags, linkerScriptFlags)
		linkerDeps = append(linkerDeps, library.versionScriptPath)
		linkerDeps = append(linkerDeps, library.versionScriptPath.Path())
		}

		fileName := library.getLibName(ctx) + flags.Toolchain.ShlibSuffix()
		@@ -1185,8 +1204,8 @@ func (library *libraryDecorator) link(ctx ModuleContext,
		library.addExportedGeneratedHeaders(library.baseCompiler.pathDeps...)
		}

		if library.buildStubs() {
		library.reexportFlags("-D" + versioningMacroName(ctx.ModuleName()) + "=" + library.stubsVersion())
		if library.buildStubs() && !library.skipAPIDefine {
		library.reexportFlags("-D" + versioningMacroName(ctx.baseModuleName()) + "=" + library.stubsVersion())
		}

		library.flagExporter.setProvider(ctx)
		@@ -1353,10 +1372,34 @@ func (library libraryDecorator) symbolFileForAbiCheck(ctx ModuleContext) strin
		return nil
		}

		func (library *libraryDecorator) hasStubsVariants() bool {
		return len(library.Properties.Stubs.Versions) > 0
		}

		func (library *libraryDecorator) stubsVersions(ctx android.BaseMutatorContext) []string {
		return library.Properties.Stubs.Versions
		}

		func (library *libraryDecorator) setStubsVersion(version string) {
		library.MutatedProperties.StubsVersion = version
		}

		func (library *libraryDecorator) stubsVersion() string {
		return library.MutatedProperties.StubsVersion
		}

		func (library *libraryDecorator) setBuildStubs() {
		library.MutatedProperties.BuildStubs = true
		}

		func (library *libraryDecorator) setAllStubsVersions(versions []string) {
		library.MutatedProperties.AllStubsVersions = versions
		}

		func (library *libraryDecorator) allStubsVersions() []string {
		return library.MutatedProperties.AllStubsVersions
		}

		func (library *libraryDecorator) isLatestStubVersion() bool {
		versions := library.Properties.Stubs.Versions
		return versions[len(versions)-1] == library.stubsVersion()
		@@ -1573,20 +1616,33 @@ func createVersionVariations(mctx android.BottomUpMutatorContext, versions []str
		mctx.CreateAliasVariation("latest", latestVersion)
		}

		func createPerApiVersionVariations(mctx android.BottomUpMutatorContext, minSdkVersion string) {
		from, err := nativeApiLevelFromUser(mctx, minSdkVersion)
		if err != nil {
		mctx.PropertyErrorf("min_sdk_version", err.Error())
		return
		}

		versionStrs := ndkLibraryVersions(mctx, from)
		modules := mctx.CreateLocalVariations(versionStrs...)

		for i, module := range modules {
		module.(*Module).Properties.Sdk_version = StringPtr(versionStrs[i])
		}
		}

		func CanBeOrLinkAgainstVersionVariants(module interface {
		Host() bool
		InRamdisk() bool
		InRecovery() bool
		UseSdk() bool
		}) bool {
		return !module.Host() && !module.InRamdisk() && !module.InRecovery() && !module.UseSdk()
		return !module.Host() && !module.InRamdisk() && !module.InRecovery()
		}

		func CanBeVersionVariant(module interface {
		Host() bool
		InRamdisk() bool
		InRecovery() bool
		UseSdk() bool
		CcLibraryInterface() bool
		Shared() bool
		Static() bool
		@@ -1599,9 +1655,9 @@ func CanBeVersionVariant(module interface {
		// and propagates the value from implementation libraries to llndk libraries with the same name.
		func versionSelectorMutator(mctx android.BottomUpMutatorContext) {
		if library, ok := mctx.Module().(LinkableInterface); ok && CanBeVersionVariant(library) {
		if library.CcLibrary() && library.BuildSharedVariant() && len(library.StubsVersions()) > 0 {

		versions := library.StubsVersions()
		if library.CcLibraryInterface() && library.BuildSharedVariant() {
		versions := library.StubsVersions(mctx)
		if len(versions) > 0 {
		normalizeVersions(mctx, versions)
		if mctx.Failed() {
		return
		@@ -1611,15 +1667,6 @@ func versionSelectorMutator(mctx android.BottomUpMutatorContext) {
		library.SetAllStubsVersions(versions)
		return
		}

		if c, ok := library.(*Module); ok && c.IsStubs() {
		// Get the versions from the implementation module.
		impls := mctx.GetDirectDepsWithTag(llndkImplDep)
		if len(impls) > 1 {
		panic(fmt.Errorf("Expected single implmenetation library, got %d", len(impls)))
		} else if len(impls) == 1 {
		c.SetAllStubsVersions(impls[0].(*Module).AllStubsVersions())
		}
		}
		}
		}
		@@ -1629,6 +1676,16 @@ func versionSelectorMutator(mctx android.BottomUpMutatorContext) {
		func versionMutator(mctx android.BottomUpMutatorContext) {
		if library, ok := mctx.Module().(LinkableInterface); ok && CanBeVersionVariant(library) {
		createVersionVariations(mctx, library.AllStubsVersions())
		return
		}

		if m, ok := mctx.Module().(*Module); ok {
		if m.SplitPerApiLevel() && m.IsSdkVariant() {
		if mctx.Os() != android.Android {
		return
		}
		createPerApiVersionVariations(mctx, m.MinSdkVersion())
		}
		}
		}

cc/linkable.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ type LinkableInterface interface {

		NonCcVariants() bool

		StubsVersions() []string
		StubsVersions(android.BaseMutatorContext) []string
		BuildStubs() bool
		SetBuildStubs()
		SetStubsVersion(string)

cc/llndk_library.go

+20 −19

Original line number	Diff line number	Diff line
		@@ -15,17 +15,14 @@
		package cc

		import (
		"fmt"
		"path/filepath"
		"strings"

		"android/soong/android"

		"github.com/google/blueprint"
		)

		var llndkImplDep = struct {
		blueprint.DependencyTag
		}{}
		var llndkImplDep = dependencyTag{name: "llndk impl"}

		var (
		llndkLibrarySuffix = ".llndk"
		@@ -72,9 +69,6 @@ type llndkStubDecorator struct {

		Properties llndkLibraryProperties

		exportHeadersTimestamp android.OptionalPath
		versionScriptPath android.ModuleGenPath

		movedToApex bool
		}

		@@ -93,7 +87,9 @@ func (stub *llndkStubDecorator) compile(ctx ModuleContext, flags Flags, deps Pat
		vndkVer = stub.stubsVersion()
		}
		objs, versionScript := compileStubLibrary(ctx, flags, String(stub.Properties.Symbol_file), vndkVer, "--llndk")
		stub.versionScriptPath = versionScript
		if !Bool(stub.Properties.Unversioned) {
		stub.versionScriptPath = android.OptionalPathForPath(versionScript)
		}
		return objs
		}

		@@ -142,12 +138,6 @@ func (stub *llndkStubDecorator) link(ctx ModuleContext, flags Flags, deps PathDe
		stub.movedToApex = implApexModule.DirectlyInAnyApex()
		}

		if !Bool(stub.Properties.Unversioned) {
		linkerScriptFlag := "-Wl,--version-script," + stub.versionScriptPath.String()
		flags.Local.LdFlags = append(flags.Local.LdFlags, linkerScriptFlag)
		flags.LdFlagsDeps = append(flags.LdFlagsDeps, stub.versionScriptPath)
		}

		if len(stub.Properties.Export_preprocessed_headers) > 0 {
		genHeaderOutDir := android.PathForModuleGen(ctx, "include")

		@@ -170,10 +160,6 @@ func (stub *llndkStubDecorator) link(ctx ModuleContext, flags Flags, deps PathDe
		stub.libraryDecorator.flagExporter.Properties.Export_include_dirs = []string{}
		}

		if stub.stubsVersion() != "" {
		stub.reexportFlags("-D" + versioningMacroName(ctx.baseModuleName()) + "=" + stub.stubsVersion())
		}

		return stub.libraryDecorator.link(ctx, flags, deps, objs)
		}

		@@ -181,6 +167,21 @@ func (stub *llndkStubDecorator) nativeCoverage() bool {
		return false
		}

		func (stub *llndkStubDecorator) buildStubs() bool {
		return true
		}

		func (stub *llndkStubDecorator) stubsVersions(ctx android.BaseMutatorContext) []string {
		// Get the versions from the implementation module.
		impls := ctx.GetDirectDepsWithTag(llndkImplDep)
		if len(impls) > 1 {
		panic(fmt.Errorf("Expected single implmenetation library, got %d", len(impls)))
		} else if len(impls) == 1 {
		return impls[0].(*Module).AllStubsVersions()
		}
		return nil
		}

		func NewLLndkStubLibrary() *Module {
		module, library := NewLibrary(android.DeviceSupported)
		library.BuildOnlyShared()