commit c9778e339d936be09f4415413538617c64734967
author Colin Cross <ccross@android.com> Wed May 04 23:34:53 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 04 23:34:54 2016 +0000
tree 027b9d44f033ab9779ec28a7fa6af19e2e4f9633
parent fa4ff9defd768b43a030939cd4dc28ed281ae8b7
parent 4e2c57ab0a5c0f2efe5e21c95f7dfa1907b6c150

Merge "Pass SANTIIZE_HOST and SANITIZE_TARGET to soong"

core/soong.mk

diff --git a/core/soong.mk b/core/soong.mk
index aaaa136..3450695 100644
--- a/core/soong.mk
+++ b/core/soong.mk
@@ -42,6 +42,8 @@
 	echo '    "Brillo": $(if $(BRILLO),true,false),'; \
 	echo '    "Malloc_not_svelte": $(if $(filter true,$(MALLOC_SVELTE)),false,true),'; \
 	echo '    "Allow_missing_dependencies": $(if $(TARGET_BUILD_APPS)$(filter true,$(SOONG_ALLOW_MISSING_DEPENDENCIES)),true,false),'; \
+	echo '    "SanitizeHost": [$(if $(SANITIZE_HOST),"$(subst $(comma),"$(comma)",$(SANITIZE_HOST))")],'; \
+	echo '    "SanitizeDevice": [$(if $(SANITIZE_TARGET),"$(subst $(comma),"$(comma)",$(SANITIZE_TARGET))")],'; \
 	echo ''; \
 	echo '    "DeviceName": "$(TARGET_DEVICE)",'; \
 	echo '    "DeviceArch": "$(TARGET_ARCH)",'; \