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

Commit e0edaf9d authored by Colin Cross's avatar Colin Cross Committed by Inseob Kim
Browse files

Remove some global state from vendor and recovery snapshots 

Snapshots storead global sets of modules that should be replaced with
vendor snapshot modules.  Move the data instead to a vendor_snapshot
or recovery_snapshot module type that depends on all the modules in
the snapshot, and then have modules that should use the snaphsot
depend on it to query for the set of modules that should be replaced.

Bug: 177098205
Test: vendor_snapshot_test.go
Change-Id: I2826adacfb473e9139b5ea93ba83b8a54cc1a56b
parent 9da4aa81

cc/cc.go

+45 −75
Original line number Diff line number Diff line
@@ -50,9 +50,7 @@ func RegisterCCBuildComponents(ctx android.RegistrationContext) { 
		ctx.BottomUp("version", versionMutator).Parallel()

		ctx.BottomUp("begin", BeginMutator).Parallel()

		ctx.BottomUp("sysprop_cc", SyspropMutator).Parallel()

		ctx.BottomUp("vendor_snapshot", VendorSnapshotMutator).Parallel()

		ctx.BottomUp("vendor_snapshot_source", VendorSnapshotSourceMutator).Parallel()

		ctx.BottomUp("recovery_snapshot", RecoverySnapshotMutator).Parallel()

		ctx.BottomUp("recovery_snapshot_source", RecoverySnapshotSourceMutator).Parallel()

	})
@@ -1937,6 +1935,40 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { 


	c.Properties.AndroidMkSystemSharedLibs = deps.SystemSharedLibs



	var snapshotInfo *SnapshotInfo

	getSnapshot := func() SnapshotInfo {

		// Only modules with BOARD_VNDK_VERSION uses snapshot.  Others use the zero value of

		// SnapshotInfo, which provides no mappings.

		if snapshotInfo == nil {

			// Only retrieve the snapshot on demand in order to avoid circular dependencies

			// between the modules in the snapshot and the snapshot itself.

			var snapshotModule []blueprint.Module

			if c.InVendor() && c.VndkVersion() == actx.DeviceConfig().VndkVersion() {

				snapshotModule = ctx.AddVariationDependencies(nil, nil, "vendor_snapshot")

			} else if recoverySnapshotVersion := actx.DeviceConfig().RecoverySnapshotVersion(); recoverySnapshotVersion != "current" && recoverySnapshotVersion != "" && c.InRecovery() {

				snapshotModule = ctx.AddVariationDependencies(nil, nil, "recovery_snapshot")

			}

			if len(snapshotModule) > 0 {

				snapshot := ctx.OtherModuleProvider(snapshotModule[0], SnapshotInfoProvider).(SnapshotInfo)

				snapshotInfo = &snapshot

				// republish the snapshot for use in later mutators on this module

				ctx.SetProvider(SnapshotInfoProvider, snapshot)

			} else {

				snapshotInfo = &SnapshotInfo{}

			}

		}



		return *snapshotInfo

	}



	rewriteSnapshotLib := func(lib string, snapshotMap map[string]string) string {

		if snapshot, ok := snapshotMap[lib]; ok {

			return snapshot

		}



		return lib

	}



	variantNdkLibs := []string{}

	variantLateNdkLibs := []string{}

	if ctx.Os() == android.Android {
@@ -1956,21 +1988,6 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { 
		// nonvariantLibs



		vendorPublicLibraries := vendorPublicLibraries(actx.Config())

		vendorSnapshotSharedLibs := vendorSnapshotSharedLibs(actx.Config())

		recoverySnapshotSharedLibs := recoverySnapshotSharedLibs(actx.Config())



		rewriteVendorLibs := func(lib string) string {

			// only modules with BOARD_VNDK_VERSION uses snapshot.

			if c.VndkVersion() != actx.DeviceConfig().VndkVersion() {

				return lib

			}



			if snapshot, ok := vendorSnapshotSharedLibs.get(lib, actx.Arch().ArchType); ok {

				return snapshot

			}



			return lib

		}



		rewriteLibs := func(list []string) (nonvariantLibs []string, variantLibs []string) {

			variantLibs = []string{}
@@ -1979,21 +1996,11 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { 
				// strip #version suffix out

				name, _ := StubsLibNameAndVersion(entry)

				if c.InRecovery() {

					recoverySnapshotVersion :=

						actx.DeviceConfig().RecoverySnapshotVersion()

					if recoverySnapshotVersion == "current" ||

						recoverySnapshotVersion == "" {

						nonvariantLibs = append(nonvariantLibs, name)

					} else if snapshot, ok := recoverySnapshotSharedLibs.get(

						name, actx.Arch().ArchType); ok {

						nonvariantLibs = append(nonvariantLibs, snapshot)

					} else {

						nonvariantLibs = append(nonvariantLibs, name)

					}

					nonvariantLibs = append(nonvariantLibs, rewriteSnapshotLib(entry, getSnapshot().SharedLibs))

				} else if ctx.useSdk() && inList(name, *getNDKKnownLibs(ctx.Config())) {

					variantLibs = append(variantLibs, name+ndkLibrarySuffix)

				} else if ctx.useVndk() {

					nonvariantLibs = append(nonvariantLibs, rewriteVendorLibs(entry))

					nonvariantLibs = append(nonvariantLibs, rewriteSnapshotLib(entry, getSnapshot().SharedLibs))

				} else if (ctx.Platform() || ctx.ProductSpecific()) && inList(name, *vendorPublicLibraries) {

					vendorPublicLib := name + vendorPublicLibrarySuffix

					if actx.OtherModuleExists(vendorPublicLib) {
@@ -2015,47 +2022,10 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { 
		deps.SharedLibs, variantNdkLibs = rewriteLibs(deps.SharedLibs)

		deps.LateSharedLibs, variantLateNdkLibs = rewriteLibs(deps.LateSharedLibs)

		deps.ReexportSharedLibHeaders, _ = rewriteLibs(deps.ReexportSharedLibHeaders)

		if ctx.useVndk() {

			for idx, lib := range deps.RuntimeLibs {

				deps.RuntimeLibs[idx] = rewriteVendorLibs(lib)

			}

		}

	}



	rewriteSnapshotLibs := func(lib string, snapshotMap *snapshotMap) string {

		// only modules with BOARD_VNDK_VERSION uses snapshot.

		if c.VndkVersion() != actx.DeviceConfig().VndkVersion() {

			return lib

		}



		if snapshot, ok := snapshotMap.get(lib, actx.Arch().ArchType); ok {

			return snapshot

		}



		return lib

	}



	snapshotHeaderLibs := vendorSnapshotHeaderLibs(actx.Config())

	snapshotStaticLibs := vendorSnapshotStaticLibs(actx.Config())

	snapshotObjects := vendorSnapshotObjects(actx.Config())



	if c.InRecovery() {

		rewriteSnapshotLibs = func(lib string, snapshotMap *snapshotMap) string {

			recoverySnapshotVersion :=

				actx.DeviceConfig().RecoverySnapshotVersion()

			if recoverySnapshotVersion == "current" ||

				recoverySnapshotVersion == "" {

				return lib

			} else if snapshot, ok := snapshotMap.get(lib, actx.Arch().ArchType); ok {

				return snapshot

			}



			return lib

		for idx, lib := range deps.RuntimeLibs {

			deps.RuntimeLibs[idx] = rewriteSnapshotLib(lib, getSnapshot().SharedLibs)

		}



		snapshotHeaderLibs = recoverySnapshotHeaderLibs(actx.Config())

		snapshotStaticLibs = recoverySnapshotStaticLibs(actx.Config())

		snapshotObjects = recoverySnapshotObjects(actx.Config())

	}



	for _, lib := range deps.HeaderLibs {
@@ -2064,7 +2034,7 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { 
			depTag.reexportFlags = true

		}



		lib = rewriteSnapshotLibs(lib, snapshotHeaderLibs)

		lib = rewriteSnapshotLib(lib, getSnapshot().HeaderLibs)



		if c.IsStubs() {

			actx.AddFarVariationDependencies(append(ctx.Target().Variations(), c.ImageVariation()),
@@ -2087,7 +2057,7 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { 
			lib = impl

		}



		lib = rewriteSnapshotLibs(lib, snapshotStaticLibs)

		lib = rewriteSnapshotLib(lib, getSnapshot().StaticLibs)



		actx.AddVariationDependencies([]blueprint.Variation{

			{Mutator: "link", Variation: "static"},
@@ -2107,7 +2077,7 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { 
			lib = impl

		}



		lib = rewriteSnapshotLibs(lib, snapshotStaticLibs)

		lib = rewriteSnapshotLib(lib, getSnapshot().StaticLibs)



		actx.AddVariationDependencies([]blueprint.Variation{

			{Mutator: "link", Variation: "static"},
@@ -2121,14 +2091,14 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { 
		depTag := libraryDependencyTag{Kind: staticLibraryDependency, staticUnwinder: true}

		actx.AddVariationDependencies([]blueprint.Variation{

			{Mutator: "link", Variation: "static"},

		}, depTag, rewriteSnapshotLibs(staticUnwinder(actx), snapshotStaticLibs))

		}, depTag, rewriteSnapshotLib(staticUnwinder(actx), getSnapshot().StaticLibs))

	}



	for _, lib := range deps.LateStaticLibs {

		depTag := libraryDependencyTag{Kind: staticLibraryDependency, Order: lateLibraryDependency}

		actx.AddVariationDependencies([]blueprint.Variation{

			{Mutator: "link", Variation: "static"},

		}, depTag, rewriteSnapshotLibs(lib, snapshotStaticLibs))

		}, depTag, rewriteSnapshotLib(lib, getSnapshot().StaticLibs))

	}



	// shared lib names without the #version suffix
@@ -2192,11 +2162,11 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { 
	actx.AddVariationDependencies(crtVariations, objDepTag, deps.ObjFiles...)

	if deps.CrtBegin != "" {

		actx.AddVariationDependencies(crtVariations, CrtBeginDepTag,

			rewriteSnapshotLibs(deps.CrtBegin, snapshotObjects))

			rewriteSnapshotLib(deps.CrtBegin, getSnapshot().Objects))

	}

	if deps.CrtEnd != "" {

		actx.AddVariationDependencies(crtVariations, CrtEndDepTag,

			rewriteSnapshotLibs(deps.CrtEnd, snapshotObjects))

			rewriteSnapshotLib(deps.CrtEnd, getSnapshot().Objects))

	}

	if deps.LinkerFlagsFile != "" {

		actx.AddDependency(c, linkerFlagsDepTag, deps.LinkerFlagsFile)

cc/sanitize.go

+10 −13
Original line number Diff line number Diff line
@@ -1149,15 +1149,13 @@ func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) { 
			// added to libFlags and LOCAL_SHARED_LIBRARIES by cc.Module

			if c.staticBinary() {

				deps := append(extraStaticDeps, runtimeLibrary)

				// If we're using snapshots and in vendor, redirect to snapshot whenever possible

				if c.VndkVersion() == mctx.DeviceConfig().VndkVersion() {

					snapshots := vendorSnapshotStaticLibs(mctx.Config())

				// If we're using snapshots, redirect to snapshot whenever possible

				snapshot := mctx.Provider(SnapshotInfoProvider).(SnapshotInfo)

				for idx, dep := range deps {

						if lib, ok := snapshots.get(dep, mctx.Arch().ArchType); ok {

					if lib, ok := snapshot.StaticLibs[dep]; ok {

						deps[idx] = lib

					}

				}

				}



				// static executable gets static runtime libs

				depTag := libraryDependencyTag{Kind: staticLibraryDependency}
@@ -1168,13 +1166,12 @@ func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) { 
				}

				mctx.AddFarVariationDependencies(variations, depTag, deps...)

			} else if !c.static() && !c.Header() {

				// If we're using snapshots and in vendor, redirect to snapshot whenever possible

				if c.VndkVersion() == mctx.DeviceConfig().VndkVersion() {

					snapshots := vendorSnapshotSharedLibs(mctx.Config())

					if lib, ok := snapshots.get(runtimeLibrary, mctx.Arch().ArchType); ok {

				// If we're using snapshots, redirect to snapshot whenever possible

				snapshot := mctx.Provider(SnapshotInfoProvider).(SnapshotInfo)

				if lib, ok := snapshot.SharedLibs[runtimeLibrary]; ok {

					runtimeLibrary = lib

				}

				}



				// Skip apex dependency check for sharedLibraryDependency

				// when sanitizer diags are enabled. Skipping the check will allow

				// building with diag libraries without having to list the

cc/sdk.go

+2 −0
Original line number Diff line number Diff line
@@ -75,5 +75,7 @@ func sdkMutator(ctx android.BottomUpMutatorContext) { 
			}

			ctx.AliasVariation("")

		}

	case *snapshot:

		ctx.CreateVariations("")

	}

}

cc/snapshot_prebuilt.go

+210 −279

File changed.

Preview size limit exceeded, changes collapsed.

cc/testing.go

+2 −6
Original line number Diff line number Diff line
@@ -586,17 +586,13 @@ func CreateTestContext(config android.Config) *android.TestContext { 
	ctx.RegisterModuleType("vendor_public_library", vendorPublicLibraryFactory)

	ctx.RegisterModuleType("filegroup", android.FileGroupFactory)

	ctx.RegisterModuleType("vndk_prebuilt_shared", VndkPrebuiltSharedFactory)

	ctx.RegisterModuleType("vendor_snapshot_shared", VendorSnapshotSharedFactory)

	ctx.RegisterModuleType("vendor_snapshot_static", VendorSnapshotStaticFactory)

	ctx.RegisterModuleType("vendor_snapshot_binary", VendorSnapshotBinaryFactory)

	vendorSnapshotImageSingleton.init(ctx)

	recoverySnapshotImageSingleton.init(ctx)

	RegisterVndkLibraryTxtTypes(ctx)

	ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators)

	android.RegisterPrebuiltMutators(ctx)

	RegisterRequiredBuildComponentsForTest(ctx)

	ctx.RegisterSingletonType("vndk-snapshot", VndkSnapshotSingleton)

	ctx.RegisterSingletonType("vendor-snapshot", VendorSnapshotSingleton)

	ctx.RegisterSingletonType("vendor-fake-snapshot", VendorFakeSnapshotSingleton)

	ctx.RegisterSingletonType("recovery-snapshot", RecoverySnapshotSingleton)



	return ctx

}