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

Commit 6186ef90 authored by Jooyung Han's avatar Jooyung Han
Browse files

Refactor around apex aconfig files 

We can iterate over the collection of apex file.

Bug: n/a
Test: m nothing --no-skip-soong-tests
Change-Id: Ibe567d3b251c54d656793dc443eb68fb9137f42f
parent cdd70d26

apex/apex.go

+16 −27
Original line number Diff line number Diff line
@@ -1937,8 +1937,6 @@ type visitorContext struct { 


	// visitor skips these from this list of module names

	unwantedTransitiveDeps []string



	aconfigFiles []android.Path

}



func (vctx *visitorContext) normalizeFileInfo(mctx android.ModuleContext) {
@@ -2005,7 +2003,6 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
				fi := apexFileForNativeLibrary(ctx, ch, vctx.handleSpecialLibs)

				fi.isJniLib = isJniLib

				vctx.filesInfo = append(vctx.filesInfo, fi)

				addAconfigFiles(vctx, ctx, child)

				// Collect the list of stub-providing libs except:

				// - VNDK libs are only for vendors

				// - bootstrap bionic libs are treated as provided by system
@@ -2017,7 +2014,6 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
				fi := apexFileForRustLibrary(ctx, ch)

				fi.isJniLib = isJniLib

				vctx.filesInfo = append(vctx.filesInfo, fi)

				addAconfigFiles(vctx, ctx, child)

				return true // track transitive dependencies

			default:

				ctx.PropertyErrorf(propertyName, "%q is not a cc_library or cc_library_shared module", depName)
@@ -2026,11 +2022,9 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
			switch ch := child.(type) {

			case *cc.Module:

				vctx.filesInfo = append(vctx.filesInfo, apexFileForExecutable(ctx, ch))

				addAconfigFiles(vctx, ctx, child)

				return true // track transitive dependencies

			case *rust.Module:

				vctx.filesInfo = append(vctx.filesInfo, apexFileForRustExecutable(ctx, ch))

				addAconfigFiles(vctx, ctx, child)

				return true // track transitive dependencies

			default:

				ctx.PropertyErrorf("binaries",
@@ -2070,7 +2064,6 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
					return false

				}

				vctx.filesInfo = append(vctx.filesInfo, af)

				addAconfigFiles(vctx, ctx, child)

				return true // track transitive dependencies

			default:

				ctx.PropertyErrorf("java_libs", "%q of type %q is not supported", depName, ctx.OtherModuleType(child))
@@ -2079,14 +2072,11 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
			switch ap := child.(type) {

			case *java.AndroidApp:

				vctx.filesInfo = append(vctx.filesInfo, apexFilesForAndroidApp(ctx, ap)...)

				addAconfigFiles(vctx, ctx, child)

				return true // track transitive dependencies

			case *java.AndroidAppImport:

				vctx.filesInfo = append(vctx.filesInfo, apexFilesForAndroidApp(ctx, ap)...)

				addAconfigFiles(vctx, ctx, child)

			case *java.AndroidTestHelperApp:

				vctx.filesInfo = append(vctx.filesInfo, apexFilesForAndroidApp(ctx, ap)...)

				addAconfigFiles(vctx, ctx, child)

			case *java.AndroidAppSet:

				appDir := "app"

				if ap.Privileged() {
@@ -2100,7 +2090,6 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
				af := newApexFile(ctx, ap.OutputFile(), ap.BaseModuleName(), appDirName, appSet, ap)

				af.certificate = java.PresignedCertificate

				vctx.filesInfo = append(vctx.filesInfo, af)

				addAconfigFiles(vctx, ctx, child)

			default:

				ctx.PropertyErrorf("apps", "%q is not an android_app module", depName)

			}
@@ -2132,7 +2121,6 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
				for _, etcFile := range filesToCopy {

					vctx.filesInfo = append(vctx.filesInfo, apexFileForPrebuiltEtc(ctx, prebuilt, etcFile))

				}

				addAconfigFiles(vctx, ctx, child)

			} else {

				ctx.PropertyErrorf("prebuilts", "%q is not a prebuilt_etc module", depName)

			}
@@ -2147,7 +2135,6 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
				af := apexFileForExecutable(ctx, ccTest)

				af.class = nativeTest

				vctx.filesInfo = append(vctx.filesInfo, af)

				addAconfigFiles(vctx, ctx, child)

				return true // track transitive dependencies

			} else {

				ctx.PropertyErrorf("tests", "%q is not a cc module", depName)
@@ -2227,7 +2214,6 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
			}



			vctx.filesInfo = append(vctx.filesInfo, af)

			addAconfigFiles(vctx, ctx, child)

			return true // track transitive dependencies

		} else if rm, ok := child.(*rust.Module); ok {

			if !android.IsDepInSameApex(ctx, am, am) {
@@ -2237,7 +2223,6 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
			af := apexFileForRustLibrary(ctx, rm)

			af.transitiveDep = true

			vctx.filesInfo = append(vctx.filesInfo, af)

			addAconfigFiles(vctx, ctx, child)

			return true // track transitive dependencies

		}

	} else if cc.IsHeaderDepTag(depTag) {
@@ -2260,7 +2245,6 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
			af := apexFileForRustLibrary(ctx, rustm)

			af.transitiveDep = true

			vctx.filesInfo = append(vctx.filesInfo, af)

			addAconfigFiles(vctx, ctx, child)

			return true // track transitive dependencies

		}

	} else if rust.IsRlibDepTag(depTag) {
@@ -2279,7 +2263,6 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
				return false

			}

			vctx.filesInfo = append(vctx.filesInfo, af)

			addAconfigFiles(vctx, ctx, child)

			return true // track transitive dependencies

		default:

			ctx.PropertyErrorf("bootclasspath_fragments",
@@ -2294,7 +2277,6 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
			if profileAf := apexFileForJavaModuleProfile(ctx, child.(javaModule)); profileAf != nil {

				vctx.filesInfo = append(vctx.filesInfo, *profileAf)

			}

			addAconfigFiles(vctx, ctx, child)

			return true // track transitive dependencies

		default:

			ctx.PropertyErrorf("systemserverclasspath_fragments",
@@ -2312,17 +2294,24 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
	return false

}



func addAconfigFiles(vctx *visitorContext, ctx android.ModuleContext, module blueprint.Module) {

	if dep, ok := android.OtherModuleProvider(ctx, module, android.AconfigPropagatingProviderKey); ok {

func collectAconfigFiles(ctx android.ModuleContext, apexFiles []apexFile) android.Paths {

	var aconfigFiles android.Paths

	for _, file := range apexFiles {

		if file.module == nil {

			continue

		}

		if dep, ok := android.OtherModuleProvider(ctx, file.module, android.AconfigPropagatingProviderKey); ok {

			if len(dep.AconfigFiles) > 0 && dep.AconfigFiles[ctx.ModuleName()] != nil {

			vctx.aconfigFiles = append(vctx.aconfigFiles, dep.AconfigFiles[ctx.ModuleName()]...)

				aconfigFiles = append(aconfigFiles, dep.AconfigFiles[ctx.ModuleName()]...)

			}

		}



		validationFlag := ctx.DeviceConfig().AconfigContainerValidation()

		if validationFlag == "error" || validationFlag == "warning" {

		android.VerifyAconfigBuildMode(ctx, ctx.ModuleName(), module, validationFlag == "error")

			android.VerifyAconfigBuildMode(ctx, ctx.ModuleName(), file.module, validationFlag == "error")

		}

	}

	return android.FirstUniquePaths(aconfigFiles)

}



func (a *apexBundle) shouldCheckDuplicate(ctx android.ModuleContext) bool {
@@ -2406,7 +2395,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
	// 3) some fields in apexBundle struct are configured

	a.installDir = android.PathForModuleInstall(ctx, "apex")

	a.filesInfo = vctx.filesInfo

	a.aconfigFiles = android.FirstUniquePaths(vctx.aconfigFiles)

	a.aconfigFiles = collectAconfigFiles(ctx, a.filesInfo)



	a.setPayloadFsType(ctx)

	a.setSystemLibLink(ctx)