diff options
| author | 2024-11-19 05:09:31 +0000 | |
|---|---|---|
| committer | 2024-11-19 05:09:31 +0000 | |
| commit | 6bf545ad902d8800352d0efa36aaf23e38bf41ac (patch) | |
| tree | 214768dcd431f844f8713c507850e40ec90876ab /android/variable.go | |
| parent | 57fd1ba4e39c5869aeecc082e63e2a7ea68ec964 (diff) | |
| parent | e4ebb27c5a7d945e0f63476fffc05007b387ddd8 (diff) | |
Merge "Use PRODUCT variable for default payload fs type" into main am: 876264b4cd am: e4ebb27c5a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3355918
Change-Id: I477eea309a06ec5c0c9436af7b749107c76b0695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'android/variable.go')
| -rw-r--r-- | android/variable.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/android/variable.go b/android/variable.go index 39b6c6a18..f60d447a3 100644 --- a/android/variable.go +++ b/android/variable.go @@ -409,9 +409,10 @@ type ProductVariables struct { Ndk_abis *bool `json:",omitempty"` - ForceApexSymlinkOptimization *bool `json:",omitempty"` - CompressedApex *bool `json:",omitempty"` - Aml_abis *bool `json:",omitempty"` + ForceApexSymlinkOptimization *bool `json:",omitempty"` + CompressedApex *bool `json:",omitempty"` + DefaultApexPayloadType *string `json:",omitempty"` + Aml_abis *bool `json:",omitempty"` DexpreoptGlobalConfig *string `json:",omitempty"` |