Merge "Allow for the DTB image to be built by the Android build system." into qt-dev (f8627151) · Commits · e / os / android_build

core/Makefile

+5 −3

Original line number	Diff line number	Diff line
		@@ -862,12 +862,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
		@@ -3791,6 +3792,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) \
		@@ -3843,7 +3845,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

+6 −0

Original line number	Diff line number	Diff line
		@@ -482,6 +482,12 @@ ifeq ($(AB_OTA_UPDATER),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)) \