diff options
| author | 2023-08-31 15:48:23 +0000 | |
|---|---|---|
| committer | 2023-10-23 18:26:53 +0000 | |
| commit | 96ea8845c56518e0f8d39c254464cc690b00e0c5 (patch) | |
| tree | 466298a3c1b3e396ce9f827e7cc3e184a4286ef4 /java/aar.go | |
| parent | 786c44f9f37808dc1cc9edd3a19cd6d422e885d3 (diff) | |
add manifest_values application id property to soong
Bug:278905106
Test: go test ./java --run TestManifestValuesApplicationIdSetsPackageName
and locally built a module and checked manifest pacakge_name
Change-Id: I5c8fd27c177b9e255dce197706f62580894008cb
Diffstat (limited to 'java/aar.go')
| -rw-r--r-- | java/aar.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/java/aar.go b/java/aar.go index 479b5e0be..713feee81 100644 --- a/java/aar.go +++ b/java/aar.go @@ -134,6 +134,10 @@ type aapt struct { resourcesNodesDepSet *android.DepSet[*resourcesNode] rroDirsDepSet *android.DepSet[rroDir] manifestsDepSet *android.DepSet[android.Path] + + manifestValues struct { + applicationId string + } } type split struct { @@ -380,7 +384,9 @@ func (a *aapt) buildActions(ctx android.ModuleContext, opts aaptBuildActionOptio if len(transitiveManifestPaths) > 1 && !Bool(a.aaptProperties.Dont_merge_manifests) { manifestMergerParams := ManifestMergerParams{ staticLibManifests: transitiveManifestPaths[1:], - isLibrary: a.isLibrary} + isLibrary: a.isLibrary, + packageName: a.manifestValues.applicationId, + } a.mergedManifestFile = manifestMerger(ctx, transitiveManifestPaths[0], manifestMergerParams) if !a.isLibrary { // Only use the merged manifest for applications. For libraries, the transitive closure of manifests |