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

Commit 37614d80 authored by Liana Kazanova's avatar Liana Kazanova Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add variables for init.environ.rc"" into main am: d0b03dd8 

Original change: https://android-review.googlesource.com/c/platform/build/+/3202811



Change-Id: I52b6ab657b4d45717cbb4def9928344f54feed09
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 907656e0 d0b03dd8

core/android_soong_config_vars.mk

+0 −7
Original line number Diff line number Diff line
@@ -39,15 +39,8 @@ $(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_MEDIASERVER) 


# 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))

$(call soong_config_set,ANDROID,HWADDRESS_SANITIZER_GLOBAL_OPTIONS,$(HWADDRESS_SANITIZER_GLOBAL_OPTIONS))

$(call soong_config_set_bool,ANDROID,SANITIZE_TARGET_SYSTEM_ENABLED,$(if $(filter true,$(SANITIZE_TARGET_SYSTEM)),true,false))



# For init.environ.rc

$(call soong_config_set_bool,ANDROID,GCOV_COVERAGE,$(NATIVE_COVERAGE))

$(call soong_config_set_bool,ANDROID,CLANG_COVERAGE,$(CLANG_COVERAGE))

$(call soong_config_set,ANDROID,SCUDO_ALLOCATION_RING_BUFFER_SIZE,$(PRODUCT_SCUDO_ALLOCATION_RING_BUFFER_SIZE))



# PRODUCT_PRECOMPILED_SEPOLICY defaults to true. Explicitly check if it's "false" or not.

$(call soong_config_set_bool,ANDROID,PRODUCT_PRECOMPILED_SEPOLICY,$(if $(filter false,$(PRODUCT_PRECOMPILED_SEPOLICY)),false,true))