diff options
| author | Christopher Ferris <cferris@google.com> | 2024-05-06 19:45:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-06 19:45:06 +0000 |
| commit | 8e46fa38f165717746f6f4a43846c8dfa0a4026b (patch) | |
| tree | 61b02b102e96534430df1644e1f7afda99144f88 | |
| parent | 5a99056218e4baa26de4d7ee1f0f53b2bd7a3b8d (diff) | |
| parent | 9ff5fbb02382506ee213910e210d2411c87b1246 (diff) | |
| download | build-8e46fa38f165717746f6f4a43846c8dfa0a4026b.tar.gz | |
Merge "Add MALLOC_LOW_MEMORY as synonym for MALLOC_SVELTE." into main
| -rw-r--r-- | core/board_config.mk | 2 | ||||
| -rw-r--r-- | core/soong_config.mk | 2 | ||||
| -rw-r--r-- | target/board/ndk/BoardConfig.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/board_config.mk b/core/board_config.mk index 633303f01a..e184601008 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -274,7 +274,7 @@ endif ifneq ($(MALLOC_IMPL),) $(warning *** Unsupported option MALLOC_IMPL defined by board config: $(board_config_mk).) - $(error Use `MALLOC_SVELTE := true` to configure jemalloc for low-memory) + $(error Use `MALLOC_LOW_MEMORY := true` to use low-memory allocator config) endif board_config_mk := diff --git a/core/soong_config.mk b/core/soong_config.mk index 534270e308..acd213c776 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -154,7 +154,7 @@ $(call add_json_list, ExtraVndkVersions, $(PRODUCT_EXTRA_VNDK_VE $(call add_json_list, DeviceSystemSdkVersions, $(BOARD_SYSTEMSDK_VERSIONS)) $(call add_json_str, RecoverySnapshotVersion, $(RECOVERY_SNAPSHOT_VERSION)) $(call add_json_list, Platform_systemsdk_versions, $(PLATFORM_SYSTEMSDK_VERSIONS)) -$(call add_json_bool, Malloc_not_svelte, $(call invert_bool,$(filter true,$(MALLOC_SVELTE)))) +$(call add_json_bool, Malloc_low_memory, $(findstring true,$(MALLOC_SVELTE) $(MALLOC_LOW_MEMORY))) $(call add_json_bool, Malloc_zero_contents, $(call invert_bool,$(filter false,$(MALLOC_ZERO_CONTENTS)))) $(call add_json_bool, Malloc_pattern_fill_contents, $(MALLOC_PATTERN_FILL_CONTENTS)) $(call add_json_str, Override_rs_driver, $(OVERRIDE_RS_DRIVER)) diff --git a/target/board/ndk/BoardConfig.mk b/target/board/ndk/BoardConfig.mk index b485f8b79e..d5399b226b 100644 --- a/target/board/ndk/BoardConfig.mk +++ b/target/board/ndk/BoardConfig.mk @@ -15,6 +15,6 @@ TARGET_ARCH_SUITE := ndk -MALLOC_SVELTE := true +MALLOC_LOW_MEMORY := true USE_SAFESTACK := false |