From 87ef4b8aee0eda7ca412c51b0e2c3d89ac3b0db9 Mon Sep 17 00:00:00 2001
From: Nelson Li <nelsonli@google.com>
Date: Wed, 11 Sep 2024 16:46:45 +0800
Subject: [PATCH] Move create_root_structure.mk to the dont_bother block.

Bug: 353642907
Test: m -j init.environ.rc
Change-Id: I54671a194dbf2005286cb8386cafd93fbef75975
---
 core/main.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/main.mk b/core/main.mk
index 8d0b465e0a..207618246f 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -297,6 +297,9 @@ droid_targets : blueprint_tools
 checkbuild: blueprint_tests
 endif
 
+# Create necessary directories and symlinks in the root filesystem
+include system/core/rootdir/create_root_structure.mk
+
 endif # dont_bother
 
 ifndef subdir_makefiles_total
@@ -305,9 +308,6 @@ endif
 
 $(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.
 # -------------------------------------------------------------------