commit bc5a4271eec367703abba4167d9c03db7e18087c
author Hsin-Yi Chen <hsinyichen@google.com> Wed Feb 21 07:42:50 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 21 07:42:50 2024 +0000
tree 829f983d886a00269c28639dfc2f65c1032b704f
parent 9001b9afbf1bc41f03e2bedf99140db02d00b838
parent 23d855680c5eebc2dcd2a462016c824c8cc370b4

Merge "Define a make target for all LLNDK dumps" into main

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 5afdd6c..90ac75f 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -152,10 +152,6 @@
 $(call add_soong_config_var_value,ANDROID,avf_enabled,$(PRODUCT_AVF_ENABLED))
 endif
 
-ifdef PRODUCT_AVF_KERNEL_MODULES_ENABLED
-$(call add_soong_config_var_value,ANDROID,avf_kernel_modules_enabled,$(PRODUCT_AVF_KERNEL_MODULES_ENABLED))
-endif
-
 $(call add_soong_config_var_value,ANDROID,release_avf_allow_preinstalled_apps,$(RELEASE_AVF_ALLOW_PREINSTALLED_APPS))
 $(call add_soong_config_var_value,ANDROID,release_avf_enable_device_assignment,$(RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT))
 $(call add_soong_config_var_value,ANDROID,release_avf_enable_dice_changes,$(RELEASE_AVF_ENABLE_DICE_CHANGES))

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index ab59b4d..9b7382b 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -434,6 +434,8 @@
   # To speedup startup of non-preopted builds, don't verify or compile the boot image.
   ADDITIONAL_SYSTEM_PROPERTIES += dalvik.vm.image-dex2oat-filter=extract
 endif
+# b/323566535
+ADDITIONAL_SYSTEM_PROPERTIES += init.svc_debug.no_fatal.zygote=true
 endif
 
 ## asan ##