commit b186331478b8c4eb6dbbfd10665f3aa2fed3ffd9
author Inseob Kim <inseob@google.com> Wed Jul 31 02:00:41 2024 +0000
committer Inseob Kim <inseob@google.com> Wed Jul 31 02:00:41 2024 +0000
tree 32daf46065f18f0c6f3e628947025af5fba79230
parent aac9b8d04fdca0a9a774b00f6982d3352d3f10e5

Revert^2 "Conditionally pass kernel version to build.prop"

ff77e222131c0c79bce658ea658afa4d6f2ba673

Change-Id: I846175bb9dc2b0e000fc39c7faf2e24167b4a513

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 72ee2e4..1d35337 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -346,6 +346,11 @@
 $(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

diff --git a/core/soong_extra_config.mk b/core/soong_extra_config.mk
index e4432d2..82d1b15 100644
--- a/core/soong_extra_config.mk
+++ b/core/soong_extra_config.mk
@@ -48,11 +48,6 @@
 
 $(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)))