Merge changes from topic "cherrypicker-L97600000961895565:N98400001386758173" into udc-dev
* changes:
Support SBOM generation of m build unbundled APEXs.
Include static libraries information in Android SBOM.
diff --git a/core/Makefile b/core/Makefile
index 4208672..80abd19 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4883,7 +4883,9 @@
endif # INSTALLED_BOOTIMAGE_TARGET
endif # my_board_extracted_kernel
-ifneq ($(my_board_extracted_kernel),true)
+ifeq ($(my_board_extracted_kernel),true)
+$(call dist-for-goals, droid_targets, $(BUILT_KERNEL_VERSION_FILE))
+else
$(warning Neither INSTALLED_KERNEL_TARGET nor INSTALLED_BOOTIMAGE_TARGET is defined when \
PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS is true. Information about the updated kernel \
cannot be built into OTA update package. You can fix this by: \