Merge "Allow WalkPayloadDeps to be called from mutators" into main (4649b1fb) · Commits · e / os / android_build_soong

android/apex.go

+3 −3

Original line number	Diff line number	Diff line
		@@ -989,8 +989,8 @@ func (d *ApexBundleDepsInfo) BuildDepsInfoLists(ctx ModuleContext, minSdkVersion
		// Function called while walking an APEX's payload dependencies.
		//
		// Return true if the `to` module should be visited, false otherwise.
		type PayloadDepsCallback func(ctx ModuleContext, from blueprint.Module, to ApexModule, externalDep bool) bool
		type WalkPayloadDepsFunc func(ctx ModuleContext, do PayloadDepsCallback)
		type PayloadDepsCallback func(ctx BaseModuleContext, from blueprint.Module, to ApexModule, externalDep bool) bool
		type WalkPayloadDepsFunc func(ctx BaseModuleContext, do PayloadDepsCallback)

		// ModuleWithMinSdkVersionCheck represents a module that implements min_sdk_version checks
		type ModuleWithMinSdkVersionCheck interface {
		@@ -1017,7 +1017,7 @@ func CheckMinSdkVersion(ctx ModuleContext, minSdkVersion ApiLevel, walk WalkPayl
		return
		}

		walk(ctx, func(ctx ModuleContext, from blueprint.Module, to ApexModule, externalDep bool) bool {
		walk(ctx, func(ctx BaseModuleContext, from blueprint.Module, to ApexModule, externalDep bool) bool {
		if externalDep {
		// external deps are outside the payload boundary, which is "stable"
		// interface. We don't have to check min_sdk_version for external

apex/apex.go

+3 −3

Original line number	Diff line number	Diff line
		@@ -1809,7 +1809,7 @@ func apexFileForFilesystem(ctx android.BaseModuleContext, buildFile android.Path
		// visited module, the `do` callback is executed. Returning true in the callback continues the visit
		// to the child modules. Returning false makes the visit to continue in the sibling or the parent
		// modules. This is used in check* functions below.
		func (a *apexBundle) WalkPayloadDeps(ctx android.ModuleContext, do android.PayloadDepsCallback) {
		func (a *apexBundle) WalkPayloadDeps(ctx android.BaseModuleContext, do android.PayloadDepsCallback) {
		ctx.WalkDeps(func(child, parent android.Module) bool {
		am, ok := child.(android.ApexModule)
		if !ok \|\| !am.CanHaveApexVariants() {
		@@ -2655,7 +2655,7 @@ func (a *apexBundle) checkStaticLinkingToStubLibraries(ctx android.ModuleContext

		abInfo, _ := android.ModuleProvider(ctx, android.ApexBundleInfoProvider)

		a.WalkPayloadDeps(ctx, func(ctx android.ModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool {
		a.WalkPayloadDeps(ctx, func(ctx android.BaseModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool {
		if ccm, ok := to.(*cc.Module); ok {
		apexName := ctx.ModuleName()
		fromName := ctx.OtherModuleName(from)
		@@ -2767,7 +2767,7 @@ func (a *apexBundle) checkApexAvailability(ctx android.ModuleContext) {
		return
		}

		a.WalkPayloadDeps(ctx, func(ctx android.ModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool {
		a.WalkPayloadDeps(ctx, func(ctx android.BaseModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool {
		// As soon as the dependency graph crosses the APEX boundary, don't go further.
		if externalDep {
		return false

apex/builder.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -1092,7 +1092,7 @@ func (a *apexBundle) buildApexDependencyInfo(ctx android.ModuleContext) {
		}

		depInfos := android.DepNameToDepInfoMap{}
		a.WalkPayloadDeps(ctx, func(ctx android.ModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool {
		a.WalkPayloadDeps(ctx, func(ctx android.BaseModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool {
		if from.Name() == to.Name() {
		// This can happen for cc.reuseObjTag. We are not interested in tracking this.
		// As soon as the dependency graph crosses the APEX boundary, don't go further.

java/app.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -1135,7 +1135,7 @@ func collectJniDeps(ctx android.ModuleContext,
		return jniLibs, prebuiltJniPackages
		}

		func (a *AndroidApp) WalkPayloadDeps(ctx android.ModuleContext, do android.PayloadDepsCallback) {
		func (a *AndroidApp) WalkPayloadDeps(ctx android.BaseModuleContext, do android.PayloadDepsCallback) {
		ctx.WalkDeps(func(child, parent android.Module) bool {
		isExternal := !a.DepIsInSameApex(ctx, child)
		if am, ok := child.(android.ApexModule); ok {
		@@ -1153,7 +1153,7 @@ func (a *AndroidApp) buildAppDependencyInfo(ctx android.ModuleContext) {
		}

		depsInfo := android.DepNameToDepInfoMap{}
		a.WalkPayloadDeps(ctx, func(ctx android.ModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool {
		a.WalkPayloadDeps(ctx, func(ctx android.BaseModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool {
		depName := to.Name()

		// Skip dependencies that are only available to APEXes; they are developed with updatability

java/sdk_library.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -1323,7 +1323,7 @@ func (module *SdkLibrary) CheckMinSdkVersion(ctx android.ModuleContext) {
		}

		func CheckMinSdkVersion(ctx android.ModuleContext, module *Library) {
		android.CheckMinSdkVersion(ctx, module.MinSdkVersion(ctx), func(c android.ModuleContext, do android.PayloadDepsCallback) {
		android.CheckMinSdkVersion(ctx, module.MinSdkVersion(ctx), func(c android.BaseModuleContext, do android.PayloadDepsCallback) {
		ctx.WalkDeps(func(child android.Module, parent android.Module) bool {
		isExternal := !module.depIsInSameApex(ctx, child)
		if am, ok := child.(android.ApexModule); ok {