From f2289bfdd2ced215a07dfeff9de83ec8164222f3 Mon Sep 17 00:00:00 2001 From: Liana Kazanova Date: Wed, 31 Jul 2024 17:56:36 +0000 Subject: [PATCH] Revert "Add variables for init.environ.rc" Revert submission 3197177-init_environ_rc_soong Reason for revert: DroidMonitor: Potential culprit for b/356587212 - 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:3197177-init_environ_rc_soong Change-Id: I7cfe54a994179577a7f3e3f86618ff04980aaf35 --- core/android_soong_config_vars.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index cd780efb3f..461b28403d 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -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))