diff options
| author | 2024-06-14 03:38:01 +0000 | |
|---|---|---|
| committer | 2024-06-14 03:38:01 +0000 | |
| commit | 27c00a8bd2c4d93c0b70164778a11ad0f33dd09c (patch) | |
| tree | ff8843d7042a339742abf53cc2480799341e8085 /java/aar.go | |
| parent | 0f81d852783f49a748dc3435345880df9268669c (diff) | |
| parent | 0ef709565e2911abdf3b0279feedcd06fcf38254 (diff) | |
Merge "Pass --non-updatable-system flag to aapt2 when versionCode is unspecified" into main am: 0ef709565e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3076227
Change-Id: I3b90331dc154b29292a9fcf72caf70458eaff233
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 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/java/aar.go b/java/aar.go index 07392f6e5..1d05e4816 100644 --- a/java/aar.go +++ b/java/aar.go @@ -107,6 +107,10 @@ type aaptProperties struct { // Names of aconfig_declarations modules that specify aconfig flags that the module depends on. Flags_packages []string + + // If set, `--non-updatable-system` flag is not passed to aapt2 even when + // `--version-code` is not specified in the `aaptFlags` property list or in the manifest. + DisableNonUpdatableSystem bool `blueprint:"mutated"` } type aapt struct { @@ -308,9 +312,9 @@ func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkContext android.SdkConte // This behavior has been copied from Make. linkFlags = append(linkFlags, "--target-sdk-version "+minSdkVersion) - // Version code - if !hasVersionCode { - linkFlags = append(linkFlags, "--version-code", ctx.Config().PlatformSdkVersion().String()) + // Mark non updatable when the module does not specify a version code + if !a.aaptProperties.DisableNonUpdatableSystem && !hasVersionCode { + linkFlags = append(linkFlags, "--non-updatable-system") } if !hasVersionName { |