commit f282f5521da2c2cdb77ef85852a6244044abecc6
author Yi-Yo Chiang <yochiang@google.com> Tue Jan 11 17:19:23 2022 +0800
committer Yi-Yo Chiang <yochiang@google.com> Tue Jan 11 17:31:16 2022 +0800
tree c598c67421fe88bf9f4728ac31c66bb93dfbc6ba
parent 27a309f62770b25b0bc604e51c3fe10f94dd5197

Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST

Right now if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST is given,
  $ m dist bootimage
would copy boot*.img to the dist dir.

After this change, both
  $ m dist  # droidcore
  $ m dist bootimage
would copy boot*.img to the dist dir, the difference is that the latter
builds & copies *only* the boot images.

Bug: 212486689
Test: m dist bootimage
Test: m dist => boot*.img are copied to dist dir
Change-Id: I1c714ce5d75eba93e32078b1ac291a181b05405a

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index d17f0cb..9a797f2 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1877,6 +1877,10 @@
     )
   endif
 
+  ifeq ($(PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST),true)
+    $(call dist-for-goals, droidcore-unbundled, $(INSTALLED_BOOTIMAGE_TARGET))
+  endif
+
   ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
     $(call dist-for-goals, droidcore-unbundled, \
       $(recovery_ramdisk) \