diff options
| author | 2023-12-08 11:31:22 +0000 | |
|---|---|---|
| committer | 2023-12-08 11:31:22 +0000 | |
| commit | 59bb904d6c7b38417059df1345da467a07f5e148 (patch) | |
| tree | 6c6996e051688caacdd9c2bd9f9309f57d2261fd /java/aar.go | |
| parent | 8172cfb509c9c71046e66e9ee7bce51f3c67d2ed (diff) | |
| parent | 1befeeb5e8684ad5aa6efc7273edaab2a89d2055 (diff) | |
Merge changes from topic "aconfig_dump_map" into main am: 25c187cc7d am: 1ed5d5ca20 am: 1befeeb5e8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854663
Change-Id: I18069b9fa74f1c72527bff397c61bc5510e7a684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/aar.go')
| -rw-r--r-- | java/aar.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/aar.go b/java/aar.go index 3df58f28c..ac619618d 100644 --- a/java/aar.go +++ b/java/aar.go @@ -351,6 +351,7 @@ type aaptBuildActionOptions struct { excludedLibs []string enforceDefaultTargetSdkVersion bool extraLinkFlags []string + aconfigTextFiles android.Paths } func (a *aapt) buildActions(ctx android.ModuleContext, opts aaptBuildActionOptions) { @@ -531,7 +532,8 @@ func (a *aapt) buildActions(ctx android.ModuleContext, opts aaptBuildActionOptio transitiveAssets = android.ReverseSliceInPlace(staticDeps.assets()) } aapt2Link(ctx, packageRes, srcJar, proguardOptionsFile, rTxt, - linkFlags, linkDeps, compiledRes, compiledOverlay, transitiveAssets, splitPackages) + linkFlags, linkDeps, compiledRes, compiledOverlay, transitiveAssets, splitPackages, + opts.aconfigTextFiles) // Extract assets from the resource package output so that they can be used later in aapt2link // for modules that depend on this one. if android.PrefixInList(linkFlags, "-A ") { @@ -1195,7 +1197,7 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { transitiveAssets := android.ReverseSliceInPlace(staticDeps.assets()) aapt2Link(ctx, a.exportPackage, nil, proguardOptionsFile, a.rTxt, - linkFlags, linkDeps, nil, overlayRes, transitiveAssets, nil) + linkFlags, linkDeps, nil, overlayRes, transitiveAssets, nil, nil) a.rJar = android.PathForModuleOut(ctx, "busybox/R.jar") resourceProcessorBusyBoxGenerateBinaryR(ctx, a.rTxt, a.manifest, a.rJar, nil, true) |