StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the creation of the root structure to build/core/main.mk

Browse Source 
Since Soong currently doesn't support the `install_directory`
functionality, `system/core/rootdir/Android.mk` cannot be directly
converted to Android.bp. Moreover, its main content is to create
directories and symlinks for the root file system. Therefore, we'll
first rename it and move it to build/core/main.mk for handling.

In addition, consolidate the handling of meta-lic related parts into
`build/core/tasks/meta-lic.mk`.

Bug: 353642907
Test: m -j init.environ.rc
Change-Id: Ie8f8bcae5752d22c331b33a33981a959410f0a69
This commit is contained in:
Nelson Li
2024-09-10 06:51:10 +00:00
parent 86514e58df
commit 1646e5c028
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/main.mk
View File

@@ -305,6 +305,9 @@ 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.
# ------------------------------------------------------------------- # -------------------------------------------------------------------

3
core/tasks/meta-lic.mk
View File

@@ -225,3 +225,6 @@ $(eval $(call declare-1p-copy-files,packages/services/Car,))
# Moved here from hardware/libhardware_legacy/Android.mk # Moved here from hardware/libhardware_legacy/Android.mk
$(eval $(call declare-1p-copy-files,hardware/libhardware_legacy,)) $(eval $(call declare-1p-copy-files,hardware/libhardware_legacy,))
# Moved here from system/core/rootdir/Android.mk
$(eval $(call declare-1p-copy-files,system/core/rootdir,))