ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert ramdisk_node_list to Android.bp

Browse source 
`ramdisk_node_list` is a hardcoded dependency in
`build/make/core/Makefile`, but it only serves as an input for
generating `ramdisk.img` and isn't installed on the device.

Therefore, we can directly use a `filegroup` and set
`export_to_make_var` for use in build/make/core/Makefile.

In addition, since there are no `Android.mk` files in the
subdirectories of `system/core/rootdir/`,
`include (callall−makefiles−under,(LOCAL_PATH))` can also be
deleted.

Bug: 359423289
Test: m -j $(PRODUCT_OUT)/ramdisk.img
Change-Id: Ia2bf636bfd7917bf7044d9726b4b52932bb161c8
This commit is contained in:
Nelson Li 2024-08-14 15:29:36 +08:00
parent 0fe7deb212
commit 560cb93d9e
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rootdir/Android.bp
View file

@ -189,3 +189,9 @@ prebuilt_root {
(default, default): [],
}),
}
filegroup {
name: "ramdisk_node_list",
srcs: ["ramdisk_node_list"],
export_to_make_var: "RAMDISK_NODE_LIST",
}

14
rootdir/Android.mk
View file

@ -151,17 +151,3 @@ init.environ.rc-soong := $(call intermediates-dir-for,ETC,init.environ.rc-soong)
$(eval $(call copy-one-file,$(init.environ.rc-soong),$(LOCAL_BUILT_MODULE)))
init.environ.rc-soong :=
#######################################
# ramdisk_node_list
include $(CLEAR_VARS)
LOCAL_MODULE := ramdisk_node_list
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_PATH := $(PRODUCT_OUT)
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
include $(BUILD_PREBUILT)
include $(call all-makefiles-under,$(LOCAL_PATH))