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

Commit 1ff81a85 authored by Steve Muckle's avatar Steve Muckle
Browse files

resolve merge conflicts of d4eb7a32 to oc-dr1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ibca2aa11ede8142639f919eebeaf879236f82c8b
parents 66d2b8b1 d4eb7a32

core/Makefile

+17 −17
Original line number Diff line number Diff line
@@ -1033,6 +1033,23 @@ $(if $(filter true,$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)),\ 
$(if $(2),$(hide) $(foreach kv,$(2),echo "$(kv)" >> $(1);))

endef



# $(1): modules list

# $(2): output dir

# $(3): mount point

# $(4): staging dir

# Depmod requires a well-formed kernel version so 0.0 is used as a placeholder.

define build-image-kernel-modules

    $(hide) rm -rf $(2)/lib/modules

    $(hide) mkdir -p $(2)/lib/modules

    $(hide) cp $(1) $(2)/lib/modules/

    $(hide) rm -rf $(4)

    $(hide) mkdir -p $(4)/lib/modules/0.0/$(3)lib/modules

    $(hide) cp $(1) $(4)/lib/modules/0.0/$(3)lib/modules

    $(hide) $(DEPMOD) -b $(4) 0.0

    $(hide) sed -e 's/\(.*modules.*\):/\/\1:/g' -e 's/ \([^ ]*modules[^ ]*\)/ \/\1/g' $(4)/lib/modules/0.0/modules.dep > $(2)/lib/modules/modules.dep

    $(hide) cp $(4)/lib/modules/0.0/modules.alias $(2)/lib/modules

endef



# -----------------------------------------------------------------

# Recovery image
@@ -1167,23 +1184,6 @@ $(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys) 


RECOVERYIMAGE_ID_FILE := $(PRODUCT_OUT)/recovery.id



# $(1): modules list

# $(2): output dir

# $(3): mount point

# $(4): staging dir

# Depmod requires a well-formed kernel version so 0.0 is used as a placeholder.

define build-image-kernel-modules

    $(hide) rm -rf $(2)/lib/modules

    $(hide) mkdir -p $(2)/lib/modules

    $(hide) cp $(1) $(2)/lib/modules/

    $(hide) rm -rf $(4)

    $(hide) mkdir -p $(4)/lib/modules/0.0/$(3)lib/modules

    $(hide) cp $(1) $(4)/lib/modules/0.0/$(3)lib/modules

    $(hide) $(DEPMOD) -b $(4) 0.0

    $(hide) sed -e 's/\(.*modules.*\):/\/\1:/g' -e 's/ \([^ ]*modules[^ ]*\)/ \/\1/g' $(4)/lib/modules/0.0/modules.dep > $(2)/lib/modules/modules.dep

    $(hide) cp $(4)/lib/modules/0.0/modules.alias $(2)/lib/modules

endef



# $(1): output file

define build-recoveryimage-target

  @echo ----- Making recovery image ------