commit 171f6809e757b53ceecb8e8def46104d2e191c72
author Steven Moreland <smoreland@google.com> Tue Oct 13 17:48:42 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 13 17:48:42 2020 +0000
tree fc8e81a95431889cde3ec5b67f5413bff21f0270
parent 757b419fde9de4b33d8f3409a350c68088684c3d
parent 6bb786a3a35bd2760b22c1865587b763b69d1bcd

Merge "Reflect MALLOC_ZERO_CONTENTS default true." am: 1162536936 am: 6bb786a3a3

Original change: https://android-review.googlesource.com/c/platform/build/+/1380902

Change-Id: I888280d5d395a366df0727d3986c6d9c4bedb50c

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index d5e16f7..de60b5b 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -131,7 +131,7 @@
 $(call add_json_list, DeviceSystemSdkVersions,           $(BOARD_SYSTEMSDK_VERSIONS))
 $(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_zero_contents,              $(MALLOC_ZERO_CONTENTS))
+$(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))