summaryrefslogtreecommitdiff
path: root/android/variable.go
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2024-05-07 17:49:10 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-05-07 17:49:10 +0000
commit3f01580c04bfe37c920e247015cce93cff2451c0 (patch)
treeb2165cd64e2876d8fa4c60bd322de81364143aed /android/variable.go
parent0d4a9ca79225bac10e4b62a663ee0cd09e3b314d (diff)
parenta963b94cde194257fa67ce9596026a4da2fe7523 (diff)
Merge "Make the enabled property configurable" into main
Diffstat (limited to 'android/variable.go')
-rw-r--r--android/variable.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/variable.go b/android/variable.go
index 2649fbd6f..419bd61de 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -58,13 +58,13 @@ type variableProperties struct {
// unbundled_build is a catch-all property to annotate modules that don't build in one or
// more unbundled branches, usually due to dependencies missing from the manifest.
Unbundled_build struct {
- Enabled *bool `android:"arch_variant"`
+ Enabled proptools.Configurable[bool] `android:"arch_variant,replace_instead_of_append"`
} `android:"arch_variant"`
// similar to `Unbundled_build`, but `Always_use_prebuilt_sdks` means that it uses prebuilt
// sdk specifically.
Always_use_prebuilt_sdks struct {
- Enabled *bool `android:"arch_variant"`
+ Enabled proptools.Configurable[bool] `android:"arch_variant,replace_instead_of_append"`
} `android:"arch_variant"`
Malloc_low_memory struct {