commit ab314a9f15031d0c734d86b6f19e631df415cbc5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jan 09 15:28:03 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 09 15:28:03 2025 -0800
tree 3402164ddac2a4b38a4881a065457563fdc9caa1
parent 2724c480c8916101a1efd4eab18271fc369e212d
parent 6d0b280c3019f440af26e7279ee6bfb478b23fda

Merge "Export BOARD_PREBUILT_BOOTLOADER to Soong" into main

packaging/main_soong_only.mk

diff --git a/packaging/main_soong_only.mk b/packaging/main_soong_only.mk
index 6d17314..f29e5f6 100644
--- a/packaging/main_soong_only.mk
+++ b/packaging/main_soong_only.mk
@@ -31,11 +31,17 @@
 droid: droid_targets
 
 .PHONY: droid_targets
-droid_targets: dist_files
+droid_targets: droidcore dist_files
 
 .PHONY: dist_files
 dist_files:
 
+.PHONY: droidcore
+droidcore: droidcore-unbundled
+
+.PHONY: droidcore-unbundled
+droidcore-unbundled:
+
 $(info [2/4] including distdir.mk ...)
 
 include build/make/packaging/distdir.mk
@@ -45,7 +51,6 @@
 include $(OUT_DIR)/soong/soong_phony_targets.mk
 
 goals := $(sort $(foreach pair,$(DIST_GOAL_OUTPUT_PAIRS),$(call word-colon,1,$(pair))))
-$(warning goals: $(goals))
 $(foreach goal,$(goals), \
   $(eval .PHONY: $$(goal)) \
   $(eval $$(goal):) \