Merge "Break dependency from droid_targets to blueprint_tools" am: 61de59bc36 am: a897b876e7

Original change: https://android-review.googlesource.com/c/platform/build/+/1754798

Change-Id: I313be134662bf05da0efe835681ca3c32ff6112d
This commit is contained in:
Bill Peckham 2021-07-07 20:39:51 +00:00 committed by Automerger Merge Worker
commit 87ae77f7ef

View file

@ -549,7 +549,12 @@ subdir_makefiles_total := $(words int $(subdir_makefiles) post finish)
$(foreach mk,$(subdir_makefiles),$(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] including $(mk) ...)$(eval include $(mk))) $(foreach mk,$(subdir_makefiles),$(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] including $(mk) ...)$(eval include $(mk)))
# For an unbundled image, we can skip blueprint_tools because unbundled image
# aims to remove a large number framework projects from the manifest, the
# sources or dependencies for these tools may be missing from the tree.
ifeq (,$(TARGET_BUILD_UNBUNDLED_IMAGE))
droid_targets : blueprint_tools droid_targets : blueprint_tools
endif
endif # dont_bother endif # dont_bother