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

Commit 5287eef8 authored Jul 25, 2024 by Inseob Kim

Conditionally pass kernel version to build.prop

This is to replicate Makefile's behavior as-is.

Bug: 322090587
Test: build and compare build command
Change-Id: Ide93a5acfdc30b6a97aebf26c9840fa54fcc6b87

parent 409209f0

core/soong_config.mk

+5 −0

Original line number	Original line	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))		$(call add_json_bool, ArtTargetIncludeDebugBuild, $(PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD))
	endif		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)		$(call json_end)

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

core/soong_extra_config.mk

+0 −5

Original line number	Original line	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)))		$(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_str, SystemServerCompilerFilter, $(PRODUCT_SYSTEM_SERVER_COMPILER_FILTER))

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