From 178de6308c9653889d6adc113200dc69b28cab9e Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 16 Aug 2021 14:47:27 -0700
Subject: [PATCH] Propagate USE_HOST_MUSL to Soong

Support enabling musl in Make builds with USE_HOST_MUSL=true.  Only
modules defined in Soong will use musl, but that's almost all host
modules.

Bug: 195988762
Test: m USE_HOST_MUSL=true adb
Change-Id: Ia88f6e20b302d86f2241877b017aebe218d968cf
---
 core/config.mk       | 8 ++++++++
 core/soong_config.mk | 1 +
 2 files changed, 9 insertions(+)

diff --git a/core/config.mk b/core/config.mk
index acdf15e3b1..d049dca407 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -1004,6 +1004,14 @@ endif # PRODUCT_USE_DYNAMIC_PARTITIONS
 BOARD_PREBUILT_HIDDENAPI_DIR ?=
 .KATI_READONLY := BOARD_PREBUILT_HIDDENAPI_DIR
 
+ifdef USE_HOST_MUSL
+  ifneq (,$(or $(BUILD_BROKEN_USES_BUILD_HOST_EXECUTABLE),\
+               $(BUILD_BROKEN_USES_BUILD_HOST_SHARED_LIBRARY),\
+               $(BUILD_BROKEN_USES_BUILD_HOST_STATIC_LIBRARY)))
+    $(error USE_HOST_MUSL can't be set when native host builds are enabled in Make with BUILD_BROKEN_USES_BUILD_HOST_*)
+  endif
+endif
+
 # ###############################################################
 # Set up final options.
 # ###############################################################
diff --git a/core/soong_config.mk b/core/soong_config.mk
index d3f983c380..6ed2f200a4 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -73,6 +73,7 @@ $(call add_json_str,  NativeBridgeSecondaryRelativePath, $(TARGET_NATIVE_BRIDGE_
 $(call add_json_str,  HostArch,                          $(HOST_ARCH))
 $(call add_json_str,  HostSecondaryArch,                 $(HOST_2ND_ARCH))
 $(call add_json_bool, HostStaticBinaries,                $(BUILD_HOST_static))
+$(call add_json_bool, HostMusl,                          $(USE_HOST_MUSL))
 
 $(call add_json_str,  CrossHost,                         $(HOST_CROSS_OS))
 $(call add_json_str,  CrossHostArch,                     $(HOST_CROSS_ARCH))