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

Commit 0c5304b4 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Use R.txt files from aar files directly" into main am: 4b6a3ae6 am: d2820e81 

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



Change-Id: Ica62f75a236a2e8a2cb3039ecdcae73851de1f07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0a2c3334 d2820e81

java/aar.go

+4 −4
Original line number Diff line number Diff line
@@ -1136,7 +1136,7 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
	extractedAARDir := android.PathForModuleOut(ctx, "aar")

	a.classpathFile = extractedAARDir.Join(ctx, "classes-combined.jar")

	a.manifest = extractedAARDir.Join(ctx, "AndroidManifest.xml")

	aarRTxt := extractedAARDir.Join(ctx, "R.txt")

	a.rTxt = extractedAARDir.Join(ctx, "R.txt")

	a.assetsPackage = android.PathForModuleOut(ctx, "assets.zip")

	a.proguardFlags = extractedAARDir.Join(ctx, "proguard.txt")

	android.SetProvider(ctx, ProguardSpecInfoProvider, ProguardSpecInfo{
@@ -1150,7 +1150,7 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
	ctx.Build(pctx, android.BuildParams{

		Rule:        unzipAAR,

		Input:       a.aarPath,

		Outputs:     android.WritablePaths{a.classpathFile, a.proguardFlags, a.manifest, a.assetsPackage, aarRTxt},

		Outputs:     android.WritablePaths{a.classpathFile, a.proguardFlags, a.manifest, a.assetsPackage, a.rTxt},

		Description: "unzip AAR",

		Args: map[string]string{

			"outDir":             extractedAARDir.String(),
@@ -1168,7 +1168,7 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { 


	a.exportPackage = android.PathForModuleOut(ctx, "package-res.apk")

	proguardOptionsFile := android.PathForModuleGen(ctx, "proguard.options")

	a.rTxt = android.PathForModuleOut(ctx, "R.txt")

	aaptRTxt := android.PathForModuleOut(ctx, "R.txt")

	a.extraAaptPackagesFile = android.PathForModuleOut(ctx, "extra_packages")



	var linkDeps android.Paths
@@ -1205,7 +1205,7 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
	}



	transitiveAssets := android.ReverseSliceInPlace(staticDeps.assets())

	aapt2Link(ctx, a.exportPackage, nil, proguardOptionsFile, a.rTxt,

	aapt2Link(ctx, a.exportPackage, nil, proguardOptionsFile, aaptRTxt,

		linkFlags, linkDeps, nil, overlayRes, transitiveAssets, nil, nil)



	a.rJar = android.PathForModuleOut(ctx, "busybox/R.jar")