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

Commit 07031bc1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "depmod: pair in a modules.load.charger on... 

Merge "depmod: pair in a modules.load.charger on BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD" am: bfe947b5 am: f9bd3771

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

Change-Id: I9a2204315556706c3728c43eb30ce98e7a5fa4ea
parents d1f702cd f9bd3771

core/Makefile

+10 −0
Original line number Diff line number Diff line
@@ -340,6 +340,15 @@ $(if $(filter top,$(1)),\ 
    $(call copy-many-files,$(call module-load-list-copy-paths,$(call intermediates-dir-for,PACKAGING,vendor_ramdisk_recovery_module_list$(_sep)$(_kver)),$(BOARD_VENDOR_RAMDISK_KERNEL_MODULES$(_sep)$(_kver)),$(BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD$(_sep)$(_kver)),modules.load.recovery,$(TARGET_VENDOR_RAMDISK_OUT))))

endef



# $(1): kernel module directory name (top is an out of band value for no directory)

define build-vendor-charger-load

$(if $(filter top,$(1)),\

  $(eval _kver :=)$(eval _sep :=),\

  $(eval _kver := $(1))$(eval _sep :=_))\

  $(if $(BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD$(_sep)$(_kver)),\

    $(call copy-many-files,$(call module-load-list-copy-paths,$(call intermediates-dir-for,PACKAGING,vendor_charger_module_list$(_sep)$(_kver)),$(BOARD_VENDOR_CHARGER_KERNEL_MODULES$(_sep)$(_kver)),$(BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD$(_sep)$(_kver)),modules.load.charger,$(TARGET_OUT_VENDOR))))

endef



ifneq ($(BUILDING_VENDOR_BOOT_IMAGE),true)

  # If there is no vendor boot partition, store vendor ramdisk kernel modules in the

  # boot ramdisk.
@@ -375,6 +384,7 @@ $(foreach dir,$(BOARD_KERNEL_MODULE_DIRS), \ 
  $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-image-kernel-modules-dir,VENDOR_RAMDISK,$(TARGET_VENDOR_RAMDISK_OUT),,modules.load,$(VENDOR_RAMDISK_STRIPPED_MODULE_STAGING_DIR),$(dir))) \

  $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-vendor-ramdisk-recovery-load,$(dir))) \

  $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-image-kernel-modules-dir,VENDOR,$(TARGET_OUT_VENDOR),vendor,modules.load,$(VENDOR_STRIPPED_MODULE_STAGING_DIR),$(dir))) \

  $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-vendor-charger-load,$(dir))) \

  $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-image-kernel-modules-dir,ODM,$(TARGET_OUT_ODM),odm,modules.load,,$(dir))) \

  $(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)),\

    $(eval ALL_DEFAULT_INSTALLED_MODULES += $(call build-recovery-as-boot-load,$(dir))),\