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

Commit a51e83ac authored by Alix Espino's avatar Alix Espino Committed by Automerger Merge Worker
Browse files

Merge "Use an option struct in aapt.buildActions & manifestMerger" into main am: 37e64f9c 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769926



Change-Id: I5438d2f0cd250fdaf81dcf75b2bf257e79822cca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3781b3c7 37e64f9c

java/aar.go

+27 −12
Original line number Diff line number Diff line
@@ -301,23 +301,29 @@ var extractAssetsRule = pctx.AndroidStaticRule("extractAssets", 
		CommandDeps: []string{"${config.Zip2ZipCmd}"},

	})



func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext android.SdkContext,

	classLoaderContexts dexpreopt.ClassLoaderContextMap, excludedLibs []string,

	enforceDefaultTargetSdkVersion bool, extraLinkFlags ...string) {

type aaptBuildActionOptions struct {

	sdkContext                     android.SdkContext

	classLoaderContexts            dexpreopt.ClassLoaderContextMap

	excludedLibs                   []string

	enforceDefaultTargetSdkVersion bool

	extraLinkFlags                 []string

}



func (a *aapt) buildActions(ctx android.ModuleContext, opts aaptBuildActionOptions) {



	staticResourcesNodesDepSet, staticRRODirsDepSet, staticManifestsDepSet, sharedDeps, libFlags :=

		aaptLibs(ctx, sdkContext, classLoaderContexts)

		aaptLibs(ctx, opts.sdkContext, opts.classLoaderContexts)



	// Exclude any libraries from the supplied list.

	classLoaderContexts = classLoaderContexts.ExcludeLibs(excludedLibs)

	opts.classLoaderContexts = opts.classLoaderContexts.ExcludeLibs(opts.excludedLibs)



	// App manifest file

	manifestFile := proptools.StringDefault(a.aaptProperties.Manifest, "AndroidManifest.xml")

	manifestSrcPath := android.PathForModuleSrc(ctx, manifestFile)



	manifestPath := ManifestFixer(ctx, manifestSrcPath, ManifestFixerParams{

		SdkContext:                     sdkContext,

		ClassLoaderContexts:            classLoaderContexts,

		SdkContext:                     opts.sdkContext,

		ClassLoaderContexts:            opts.classLoaderContexts,

		IsLibrary:                      a.isLibrary,

		DefaultManifestVersion:         a.defaultManifestVersion,

		UseEmbeddedNativeLibs:          a.useEmbeddedNativeLibs,
@@ -325,7 +331,7 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext android.SdkCon 
		UseEmbeddedDex:                 a.useEmbeddedDex,

		HasNoCode:                      a.hasNoCode,

		LoggingParent:                  a.LoggingParent,

		EnforceDefaultTargetSdkVersion: enforceDefaultTargetSdkVersion,

		EnforceDefaultTargetSdkVersion: opts.enforceDefaultTargetSdkVersion,

	})



	staticDeps := transitiveAarDeps(staticResourcesNodesDepSet.ToList())
@@ -341,7 +347,10 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext android.SdkCon 
	transitiveManifestPaths = append(transitiveManifestPaths, staticManifestsDepSet.ToList()...)



	if len(transitiveManifestPaths) > 1 && !Bool(a.aaptProperties.Dont_merge_manifests) {

		a.mergedManifestFile = manifestMerger(ctx, transitiveManifestPaths[0], transitiveManifestPaths[1:], a.isLibrary)

		manifestMergerParams := ManifestMergerParams{

			staticLibManifests: transitiveManifestPaths[1:],

			isLibrary:          a.isLibrary}

		a.mergedManifestFile = manifestMerger(ctx, transitiveManifestPaths[0], manifestMergerParams)

		if !a.isLibrary {

			// Only use the merged manifest for applications.  For libraries, the transitive closure of manifests

			// will be propagated to the final application and merged there.  The merged manifest for libraries is
@@ -352,12 +361,12 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext android.SdkCon 
		a.mergedManifestFile = manifestPath

	}



	compileFlags, linkFlags, linkDeps, resDirs, overlayDirs, rroDirs, resZips := a.aapt2Flags(ctx, sdkContext, manifestPath)

	compileFlags, linkFlags, linkDeps, resDirs, overlayDirs, rroDirs, resZips := a.aapt2Flags(ctx, opts.sdkContext, manifestPath)



	linkFlags = append(linkFlags, libFlags...)

	linkDeps = append(linkDeps, sharedDeps...)

	linkDeps = append(linkDeps, staticDeps.resPackages()...)

	linkFlags = append(linkFlags, extraLinkFlags...)

	linkFlags = append(linkFlags, opts.extraLinkFlags...)

	if a.isLibrary {

		linkFlags = append(linkFlags, "--static-lib")

	}
@@ -729,7 +738,13 @@ func (a *AndroidLibrary) DepsMutator(ctx android.BottomUpMutatorContext) { 
func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	a.aapt.isLibrary = true

	a.classLoaderContexts = a.usesLibrary.classLoaderContextForUsesLibDeps(ctx)

	a.aapt.buildActions(ctx, android.SdkContext(a), a.classLoaderContexts, nil, false)

	a.aapt.buildActions(ctx,

		aaptBuildActionOptions{

			sdkContext:                     android.SdkContext(a),

			classLoaderContexts:            a.classLoaderContexts,

			enforceDefaultTargetSdkVersion: false,

		},

	)



	a.hideApexVariantFromMake = !ctx.Provider(android.ApexInfoProvider).(android.ApexInfo).IsForPlatform()

java/android_manifest.go

+10 −5
Original line number Diff line number Diff line
@@ -200,11 +200,16 @@ func ManifestFixer(ctx android.ModuleContext, manifest android.Path, 
	return fixedManifest.WithoutRel()

}



func manifestMerger(ctx android.ModuleContext, manifest android.Path, staticLibManifests android.Paths,

	isLibrary bool) android.Path {

type ManifestMergerParams struct {

	staticLibManifests android.Paths

	isLibrary          bool

}



func manifestMerger(ctx android.ModuleContext, manifest android.Path,

	params ManifestMergerParams) android.Path {



	var args string

	if !isLibrary {

	if !params.isLibrary {

		// Follow Gradle's behavior, only pass --remove-tools-declarations when merging app manifests.

		args = "--remove-tools-declarations"

	}
@@ -214,10 +219,10 @@ func manifestMerger(ctx android.ModuleContext, manifest android.Path, staticLibM 
		Rule:        manifestMergerRule,

		Description: "merge manifest",

		Input:       manifest,

		Implicits:   staticLibManifests,

		Implicits:   params.staticLibManifests,

		Output:      mergedManifest,

		Args: map[string]string{

			"libs": android.JoinWithPrefix(staticLibManifests.Strings(), "--libs "),

			"libs": android.JoinWithPrefix(params.staticLibManifests.Strings(), "--libs "),

			"args": args,

		},

	})

java/app.go

+9 −2
Original line number Diff line number Diff line
@@ -481,8 +481,15 @@ func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) { 
	if a.Updatable() {

		a.aapt.defaultManifestVersion = android.DefaultUpdatableModuleVersion

	}

	a.aapt.buildActions(ctx, android.SdkContext(a), a.classLoaderContexts,

		a.usesLibraryProperties.Exclude_uses_libs, a.enforceDefaultTargetSdkVersion(), aaptLinkFlags...)

	a.aapt.buildActions(ctx,

		aaptBuildActionOptions{

			android.SdkContext(a),

			a.classLoaderContexts,

			a.usesLibraryProperties.Exclude_uses_libs,

			a.enforceDefaultTargetSdkVersion(),

			aaptLinkFlags,

		},

	)



	// apps manifests are handled by aapt, don't let Module see them

	a.properties.Manifest = nil

java/rro.go

+7 −1
Original line number Diff line number Diff line
@@ -146,7 +146,13 @@ func (r *RuntimeResourceOverlay) GenerateAndroidBuildActions(ctx android.ModuleC 
		aaptLinkFlags = append(aaptLinkFlags,

			"--rename-overlay-category "+*r.overridableProperties.Category)

	}

	r.aapt.buildActions(ctx, r, nil, nil, false, aaptLinkFlags...)

	r.aapt.buildActions(ctx,

		aaptBuildActionOptions{

			sdkContext:                     r,

			enforceDefaultTargetSdkVersion: false,

			extraLinkFlags:                 aaptLinkFlags,

		},

	)



	// Sign the built package

	_, _, certificates := collectAppDeps(ctx, r, false, false)