Merge "Revert "Make the enabled property configurable"" into aosp-main-future am: c4466a6387
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27180893 Change-Id: I1d88f9b7033829eeabaaf11deca41c8b41acf0ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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 proptools.Configurable[bool] `android:"arch_variant,replace_instead_of_append"`
|
||||
Enabled *bool `android:"arch_variant"`
|
||||
} `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 proptools.Configurable[bool] `android:"arch_variant,replace_instead_of_append"`
|
||||
Enabled *bool `android:"arch_variant"`
|
||||
} `android:"arch_variant"`
|
||||
|
||||
Malloc_not_svelte struct {
|
||||
|
Reference in New Issue
Block a user