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

Commit cf106526 authored by Nelson Li's avatar Nelson Li
Browse files

Move RECOVERY_API_VERSION and RECOVERY_FSTAB_VERSION to build/core/android_soong_config_vars.mk 

This change moves the `RECOVERY_API_VERSION` and
`RECOVERY_FSTAB_VERSION` variables from
`bootable/recovery/Android.mk` to
`build/core/android_soong_config_vars.mk`.

These two variables were previously only used in `build/core/Makefile`,
and other places manually maintained synchronization using hardcoded
values. This change adds corresponding `soong_config_variables` to
keep them synchronized and avoid errors.

Bug: 339143524
Test: m misc_info
Change-Id: I90ccb5d3023d1d88ac465fc01b691b2478658b00
parent 9f068f3c

core/android_soong_config_vars.mk

+6 −0
Original line number Diff line number Diff line
@@ -42,6 +42,12 @@ $(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_MEDIASERVER) 


$(call add_soong_config_var,ANDROID,ADDITIONAL_M4DEFS,$(if $(BOARD_SEPOLICY_M4DEFS),$(addprefix -D,$(BOARD_SEPOLICY_M4DEFS))))



# For bootable/recovery

RECOVERY_API_VERSION := 3

RECOVERY_FSTAB_VERSION := 2

$(call soong_config_set, recovery, recovery_api_version, $(RECOVERY_API_VERSION))

$(call soong_config_set, recovery, recovery_fstab_version, $(RECOVERY_FSTAB_VERSION))



# For Sanitizers

$(call soong_config_set_bool,ANDROID,ASAN_ENABLED,$(if $(filter address,$(SANITIZE_TARGET)),true,false))

$(call soong_config_set_bool,ANDROID,HWASAN_ENABLED,$(if $(filter hwaddress,$(SANITIZE_TARGET)),true,false))