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

Commit ff77e222 authored by Liana Kazanova's avatar Liana Kazanova
Browse files

Revert "Conditionally pass kernel version to build.prop" 

Revert submission 3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA

Reason for revert: DroidMonitor: Potential culprit for b/356297315 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA

Change-Id: Icba8f01ef59ce969206c20981fcc17ea10378f5e
parent dd3d5c1f

core/soong_config.mk

+0 −5
Original line number Diff line number Diff line
@@ -346,11 +346,6 @@ 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

+5 −0
Original line number Diff line number Diff line
@@ -48,6 +48,11 @@ $(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)))