Merge "Move create_root_structure.mk to the dont_bother block." into main am: 435145d063
am: 9188de2042
Original change: https://android-review.googlesource.com/c/platform/build/+/3261781 Change-Id: Ibd01ca93ea60f57f9def2a78005f8b2b3b34d25b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -300,6 +300,9 @@ droid_targets : blueprint_tools
|
|||||||
checkbuild: blueprint_tests
|
checkbuild: blueprint_tests
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Create necessary directories and symlinks in the root filesystem
|
||||||
|
include system/core/rootdir/create_root_structure.mk
|
||||||
|
|
||||||
endif # dont_bother
|
endif # dont_bother
|
||||||
|
|
||||||
ifndef subdir_makefiles_total
|
ifndef subdir_makefiles_total
|
||||||
@@ -308,9 +311,6 @@ endif
|
|||||||
|
|
||||||
$(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] finishing legacy Make module parsing ...)
|
$(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] finishing legacy Make module parsing ...)
|
||||||
|
|
||||||
# Create necessary directories and symlinks in the root filesystem
|
|
||||||
include system/core/rootdir/create_root_structure.mk
|
|
||||||
|
|
||||||
# -------------------------------------------------------------------
|
# -------------------------------------------------------------------
|
||||||
# All module makefiles have been included at this point.
|
# All module makefiles have been included at this point.
|
||||||
# -------------------------------------------------------------------
|
# -------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user