diff options
| author | Colin Cross <ccross@android.com> | 2021-08-26 05:12:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-08-26 05:12:15 +0000 |
| commit | ee20ae1a8dcdfe7b843d65099000708800d9b93a (patch) | |
| tree | eab4a5d4c8a9b5911d12534dababd1946475f7e6 | |
| parent | 8f863178dad6cdac445d07eafd822673d8eab648 (diff) | |
| parent | 178de6308c9653889d6adc113200dc69b28cab9e (diff) | |
| download | build-ee20ae1a8dcdfe7b843d65099000708800d9b93a.tar.gz | |
Merge "Propagate USE_HOST_MUSL to Soong"
| -rw-r--r-- | core/config.mk | 8 | ||||
| -rw-r--r-- | core/soong_config.mk | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/core/config.mk b/core/config.mk index 94235d9989..0b317fbf3e 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)) |