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

Define init_second_stage.recovery

Browse source 
By removing `recovery_available` property from "init_second_stage"
and defining a dedicated recovery-specific module for
"init_second_stage". `recovery_available` property should be used
to allow the reverse dependencies recovery modules to depend on
the module, not to install the module to the recovery partition.

Test: m soong_generated_recovery_filesystem_test
Bug: 381888358
Change-Id: Ie9b93b8453bc1e40f7a28e57f498313d3bc4cedb
This commit is contained in:
Jihoon Kang 2024-12-06 23:33:42 +00:00
parent 2e581b68c6
commit 9b5c6fdce8
1 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
init/Android.bp
View file

@ -268,7 +268,6 @@ phony {
cc_defaults { cc_defaults {
name: "init_second_stage_defaults", name: "init_second_stage_defaults",
recovery_available: true,
stem: "init", stem: "init",
defaults: ["init_defaults"], defaults: ["init_defaults"],
srcs: ["main.cpp"], srcs: ["main.cpp"],
@ -280,37 +279,38 @@ cc_binary {
defaults: ["init_second_stage_defaults"], defaults: ["init_second_stage_defaults"],
static_libs: ["libinit"], static_libs: ["libinit"],
visibility: ["//visibility:any_system_partition"], visibility: ["//visibility:any_system_partition"],
target: { required: [
platform: { "init.rc",
required: [ "ueventd.rc",
"init.rc", "e2fsdroid",
"ueventd.rc", "extra_free_kbytes",
"e2fsdroid", "make_f2fs",
"extra_free_kbytes", "mke2fs",
"make_f2fs", "sload_f2fs",
"mke2fs", ],
"sload_f2fs", }
],
}, cc_binary {
recovery: { name: "init_second_stage.recovery",
cflags: ["-DRECOVERY"], defaults: ["init_second_stage_defaults"],
exclude_static_libs: [ static_libs: ["libinit"],
"libxml2", recovery: true,
], cflags: ["-DRECOVERY"],
exclude_shared_libs: [ exclude_static_libs: [
"libbinder", "libxml2",
"libutils", ],
], exclude_shared_libs: [
required: [ "libbinder",
"init_recovery.rc", "libutils",
"ueventd.rc.recovery", ],
"e2fsdroid.recovery", required: [
"make_f2fs.recovery", "init_recovery.rc",
"mke2fs.recovery", "ueventd.rc.recovery",
"sload_f2fs.recovery", "e2fsdroid.recovery",
], "make_f2fs.recovery",
}, "mke2fs.recovery",
}, "sload_f2fs.recovery",
],
} }
cc_binary { cc_binary {
@ -319,7 +319,6 @@ cc_binary {
"avf_build_flags_cc", "avf_build_flags_cc",
"init_second_stage_defaults", "init_second_stage_defaults",
], ],
recovery_available: false,
static_libs: ["libinit.microdroid"], static_libs: ["libinit.microdroid"],
cflags: ["-DMICRODROID=1"], cflags: ["-DMICRODROID=1"],
no_full_install: true, no_full_install: true,