Merge "ueventd: change firmware location in apexes"
This commit is contained in:
commit
fb2dafa538
2 changed files with 2 additions and 2 deletions
|
@ -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
|
||||
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
|
||||
file. This line takes the format of
|
||||
|
|
|
@ -256,7 +256,7 @@ bool FirmwareHandler::ForEachFirmwareDirectory(
|
|||
}
|
||||
|
||||
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));
|
||||
for (size_t i = 0; i < glob_result.gl_pathc; i++) {
|
||||
char* apex_firmware_directory = glob_result.gl_pathv[i];
|
||||
|
|
Loading…
Reference in a new issue