diff options
| author | 2023-08-31 15:48:23 +0000 | |
|---|---|---|
| committer | 2023-10-23 18:26:53 +0000 | |
| commit | 96ea8845c56518e0f8d39c254464cc690b00e0c5 (patch) | |
| tree | 466298a3c1b3e396ce9f827e7cc3e184a4286ef4 /java/android_manifest.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/android_manifest.go')
| -rw-r--r-- | java/android_manifest.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/java/android_manifest.go b/java/android_manifest.go index a39c00251..082b00ee5 100644 --- a/java/android_manifest.go +++ b/java/android_manifest.go @@ -203,15 +203,21 @@ func ManifestFixer(ctx android.ModuleContext, manifest android.Path, type ManifestMergerParams struct { staticLibManifests android.Paths isLibrary bool + packageName string } func manifestMerger(ctx android.ModuleContext, manifest android.Path, params ManifestMergerParams) android.Path { - var args string + var args []string if !params.isLibrary { // Follow Gradle's behavior, only pass --remove-tools-declarations when merging app manifests. - args = "--remove-tools-declarations" + args = append(args, "--remove-tools-declarations") + } + + packageName := params.packageName + if packageName != "" { + args = append(args, "--property PACKAGE="+packageName) } mergedManifest := android.PathForModuleOut(ctx, "manifest_merger", "AndroidManifest.xml") @@ -223,7 +229,7 @@ func manifestMerger(ctx android.ModuleContext, manifest android.Path, Output: mergedManifest, Args: map[string]string{ "libs": android.JoinWithPrefix(params.staticLibManifests.Strings(), "--libs "), - "args": args, + "args": strings.Join(args, " "), }, }) |