Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d04c6af authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Propagate USE_HOST_MUSL to Soong" am: ee20ae1a am: 05d007ae am: fc8cca1e 

Original change: https://android-review.googlesource.com/c/platform/build/+/1796674

Change-Id: I1c2b02ca0318169edbe72a16577d410159116e80
parents 750b521c fc8cca1e

core/config.mk

+8 −0
Original line number Diff line number Diff line
@@ -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.

# ###############################################################

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -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))