From 5287eef8adc79c6678b7007d30804b5211c3ef2b Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Thu, 25 Jul 2024 19:54:49 +0900 Subject: [PATCH] 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 --- core/soong_config.mk | 5 +++++ core/soong_extra_config.mk | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/soong_config.mk b/core/soong_config.mk index 72ee2e441e..1d35337a2f 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -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)) diff --git a/core/soong_extra_config.mk b/core/soong_extra_config.mk index e4432d2c5c..82d1b158b3 100644 --- a/core/soong_extra_config.mk +++ b/core/soong_extra_config.mk @@ -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)))