From: Colin Cross <ccross@android.com>
Date: Thu, 11 Aug 2016 23:53:29 +0000 (+0000)
Subject: Merge "Fix discrepancy in SANITIZE_TARGET format with soong."
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0d86fc57cd8cee7707604715dad589d6f3d01aeb;p=android-x86%2Fbuild.git

Merge "Fix discrepancy in SANITIZE_TARGET format with soong."
---

0d86fc57cd8cee7707604715dad589d6f3d01aeb
diff --cc core/soong.mk
index cb0a0d040,65180d7d1..3f0ee8549
--- a/core/soong.mk
+++ b/core/soong.mk
@@@ -46,12 -39,9 +46,12 @@@ $(SOONG_VARIABLES): FORC
  	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 '    "SanitizeHost": [$(if $(SANITIZE_HOST),"$(subst $(space),"$(comma)",$(SANITIZE_HOST))")],'; \
+ 	echo '    "SanitizeDevice": [$(if $(SANITIZE_TARGET),"$(subst $(space),"$(comma)",$(SANITIZE_TARGET))")],'; \
  	echo '    "HostStaticBinaries": $(if $(strip $(BUILD_HOST_static)),true,false),'; \
 +	echo '    "Cpusets": $(if $(strip $(ENABLE_CPUSETS)),true,false),'; \
 +	echo '    "Schedboost": $(if $(strip $(ENABLE_SCHEDBOOST)),true,false),'; \
 +	echo '    "Binder32bit": $(if $(BINDER32BIT),true,false),'; \
  	echo ''; \
  	echo '    "DeviceName": "$(TARGET_DEVICE)",'; \
  	echo '    "DeviceArch": "$(TARGET_ARCH)",'; \