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

Commit 0c45b0d9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Allow for the DTB image to be built by the Android build system."

parents 65dbf9bf 59eaef07

core/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -866,12 +866,13 @@ $(call dist-for-goals, sdk win_sdk sdk_addon, $(INSTALLED_FILES_FILE_ROOT)) 


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

# dtb



ifdef BOARD_PREBUILT_DTBIMAGE_DIR

ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG

INSTALLED_DTBIMAGE_TARGET := $(PRODUCT_OUT)/dtb.img

ifdef BOARD_PREBUILT_DTBIMAGE_DIR

$(INSTALLED_DTBIMAGE_TARGET) : $(sort $(wildcard $(BOARD_PREBUILT_DTBIMAGE_DIR)/*.dtb))

	cat $^ > $@

endif

endif



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

# the ramdisk
@@ -3761,6 +3762,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
	    $(INTERNAL_SYSTEMOTHERIMAGE_FILES) \

	    $(INSTALLED_ANDROID_INFO_TXT_TARGET) \

	    $(INSTALLED_KERNEL_TARGET) \

	    $(INSTALLED_DTBIMAGE_TARGET) \

	    $(INSTALLED_2NDBOOTLOADER_TARGET) \

	    $(BOARD_PREBUILT_DTBOIMAGE) \

	    $(BOARD_PREBUILT_RECOVERY_DTBOIMAGE) \
@@ -3813,7 +3815,7 @@ endif 
ifdef BOARD_INCLUDE_RECOVERY_ACPIO

	$(hide) cp $(BOARD_RECOVERY_ACPIO) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/recovery_acpio

endif

ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG

ifdef INSTALLED_DTBIMAGE_TARGET

	$(hide) cp $(INSTALLED_DTBIMAGE_TARGET) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/dtb

endif

ifdef INTERNAL_KERNEL_CMDLINE

core/board_config.mk

+6 −0
Original line number Diff line number Diff line
@@ -518,6 +518,12 @@ ifeq ($(PRODUCT_BUILD_GENERIC_OTA_PACKAGE),true) 
  endif

endif



ifdef BOARD_PREBUILT_DTBIMAGE_DIR

  ifneq ($(BOARD_INCLUDE_DTB_IN_BOOTIMG),true)

    $(error BOARD_PREBUILT_DTBIMAGE_DIR with 'BOARD_INCLUDE_DTB_IN_BOOTIMG != true' is not supported)

  endif

endif



# Check BOARD_VNDK_VERSION

define check_vndk_version

  $(eval vndk_path := prebuilts/vndk/v$(1)) \