diff options
| author | 2024-06-14 03:38:01 +0000 | |
|---|---|---|
| committer | 2024-06-14 03:38:01 +0000 | |
| commit | 27c00a8bd2c4d93c0b70164778a11ad0f33dd09c (patch) | |
| tree | ff8843d7042a339742abf53cc2480799341e8085 /java/app.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/app.go')
| -rw-r--r-- | java/app.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/java/app.go b/java/app.go index a24099c28..cd30dc126 100644 --- a/java/app.go +++ b/java/app.go @@ -1452,6 +1452,7 @@ func AndroidTestFactory() android.Module { module.appProperties.AlwaysPackageNativeLibs = true module.Module.dexpreopter.isTest = true module.Module.linter.properties.Lint.Test = proptools.BoolPtr(true) + module.aaptProperties.DisableNonUpdatableSystem = true module.addHostAndDeviceProperties() module.AddProperties( @@ -1508,6 +1509,7 @@ func AndroidTestHelperAppFactory() android.Module { module.appProperties.AlwaysPackageNativeLibs = true module.Module.dexpreopter.isTest = true module.Module.linter.properties.Lint.Test = proptools.BoolPtr(true) + module.aaptProperties.DisableNonUpdatableSystem = true module.addHostAndDeviceProperties() module.AddProperties( |