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

Merge "ueventd: change firmware location in apexes" am: fb2dafa538 am: 25dea8c25f

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429931

Change-Id: I6fdfa020076d472f03762ae8beb29b1439f3b88c
This commit is contained in:
Jooyung Han 2020-09-22 02:26:29 +00:00 • committed by Automerger Merge Worker
commit 829aec970a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
init/README.ueventd.md
View file

@ -86,7 +86,7 @@ Ueventd by default serves firmware requests by searching through a list of firmw
for a file matching the uevent `FIRMWARE`. It then forks a process to serve this firmware to the for a file matching the uevent `FIRMWARE`. It then forks a process to serve this firmware to the
kernel. kernel.
`/apex/*/firmware` is also searched after a list of firmware directories. `/apex/*/etc/firmware` is also searched after a list of firmware directories.
The list of firmware directories is customized by a `firmware_directories` line in a ueventd.rc The list of firmware directories is customized by a `firmware_directories` line in a ueventd.rc
file. This line takes the format of file. This line takes the format of

2
init/firmware_handler.cpp
View file

@ -256,7 +256,7 @@ bool FirmwareHandler::ForEachFirmwareDirectory(
} }
glob_t glob_result; glob_t glob_result;
glob("/apex/*/firmware/", GLOB_MARK, nullptr, &glob_result); glob("/apex/*/etc/firmware/", GLOB_MARK, nullptr, &glob_result);
auto free_glob = android::base::make_scope_guard(std::bind(&globfree, &glob_result)); auto free_glob = android::base::make_scope_guard(std::bind(&globfree, &glob_result));
for (size_t i = 0; i < glob_result.gl_pathc; i++) { for (size_t i = 0; i < glob_result.gl_pathc; i++) {
char* apex_firmware_directory = glob_result.gl_pathv[i]; char* apex_firmware_directory = glob_result.gl_pathv[i];