diff options
| author | 2023-12-08 09:48:13 +0000 | |
|---|---|---|
| committer | 2023-12-08 09:48:13 +0000 | |
| commit | 25c187cc7dfb70a88a8b4fade245fa24cc9e1dcf (patch) | |
| tree | 904227f91afe1d420cc1f8b6af6b052ebc2f9035 /java/aar.go | |
| parent | 25861686fe434c5abae530258bdff4ba2e435ede (diff) | |
| parent | 84b2589e6dc85d15af273b8a293ed7f064142af7 (diff) | |
Merge changes from topic "aconfig_dump_map" into main
* changes:
Add aconfig flag support for android_app
Add aconfig flag value text file in aconfig_declarations provider
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 57a05d47b..1ab452965 100644 --- a/java/aar.go +++ b/java/aar.go @@ -349,6 +349,7 @@ type aaptBuildActionOptions struct { excludedLibs []string enforceDefaultTargetSdkVersion bool extraLinkFlags []string + aconfigTextFiles android.Paths } func (a *aapt) buildActions(ctx android.ModuleContext, opts aaptBuildActionOptions) { @@ -529,7 +530,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 ") { @@ -1193,7 +1195,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) |