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

Commit fa8586c3 authored by Inseob Kim's avatar Inseob Kim Committed by Gerrit Code Review
Browse files

Merge "Conditionally pass kernel version to build.prop" into main

parents 0a7e037a 5287eef8

core/soong_config.mk

+5 −0
Original line number Diff line number Diff line
@@ -346,6 +346,11 @@ ifneq ($(PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD),) 
$(call add_json_bool, ArtTargetIncludeDebugBuild, $(PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD))

endif



_config_enable_uffd_gc := \

  $(firstword $(OVERRIDE_ENABLE_UFFD_GC) $(PRODUCT_ENABLE_UFFD_GC) default)

$(call add_json_str, EnableUffdGc, $(_config_enable_uffd_gc))

_config_enable_uffd_gc :=



$(call json_end)



$(file >$(SOONG_VARIABLES).tmp,$(json_contents))

core/soong_extra_config.mk

+0 −5
Original line number Diff line number Diff line
@@ -48,11 +48,6 @@ $(call add_json_str, BootloaderBoardName, $(TARGET_BOOTLOADER_BOARD_NAME)) 


$(call add_json_bool, SdkBuild, $(filter sdk sdk_addon,$(MAKECMDGOALS)))



_config_enable_uffd_gc := \

  $(firstword $(OVERRIDE_ENABLE_UFFD_GC) $(PRODUCT_ENABLE_UFFD_GC) default)

$(call add_json_str, EnableUffdGc, $(_config_enable_uffd_gc))

_config_enable_uffd_gc :=



$(call add_json_str, SystemServerCompilerFilter, $(PRODUCT_SYSTEM_SERVER_COMPILER_FILTER))



$(call add_json_bool, Product16KDeveloperOption, $(filter true,$(PRODUCT_16K_DEVELOPER_OPTION)))