tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Propagate USE_HOST_MUSL to Soong

Browse source 
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
This commit is contained in:
Colin Cross 2021-08-16 14:47:27 -07:00
parent 82d34b6472
commit 178de6308c
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/config.mk
View file

@ -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.
# ###############################################################

1
core/soong_config.mk
View file

@ -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))