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

Merge "Read *.rc files from flattened APEX"

Browse source
This commit is contained in:
Treehugger Robot 2019-06-11 12:11:11 +00:00 • committed by Gerrit Code Review
commit b3093ff21a
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
init/builtins.cpp
View file

@ -1076,10 +1076,7 @@ static Result<void> do_mark_post_data(const BuiltinArguments& args) {
static Result<void> do_parse_apex_configs(const BuiltinArguments& args) { static Result<void> do_parse_apex_configs(const BuiltinArguments& args) {
glob_t glob_result; glob_t glob_result;
// @ is added to filter out the later paths, which are bind mounts of the places static constexpr char glob_pattern[] = "/apex/*/etc/*.rc";
// where the APEXes are really mounted at. Otherwise, we will parse the
// same file twice.
static constexpr char glob_pattern[] = "/apex/*@*/etc/*.rc";
const int ret = glob(glob_pattern, GLOB_MARK, nullptr, &glob_result); const int ret = glob(glob_pattern, GLOB_MARK, nullptr, &glob_result);
if (ret != 0 && ret != GLOB_NOMATCH) { if (ret != 0 && ret != GLOB_NOMATCH) {
globfree(&glob_result); globfree(&glob_result);
@ -1088,7 +1085,15 @@ static Result<void> do_parse_apex_configs(const BuiltinArguments& args) {
std::vector<std::string> configs; std::vector<std::string> configs;
Parser parser = CreateServiceOnlyParser(ServiceList::GetInstance()); Parser parser = CreateServiceOnlyParser(ServiceList::GetInstance());
for (size_t i = 0; i < glob_result.gl_pathc; i++) { for (size_t i = 0; i < glob_result.gl_pathc; i++) {
configs.emplace_back(glob_result.gl_pathv[i]); std::string path = glob_result.gl_pathv[i];
// Filter-out /apex/<name>@<ver> paths. The paths are bind-mounted to
// /apex/<name> paths, so unless we filter them out, we will parse the
// same file twice.
std::vector<std::string> paths = android::base::Split(path, "/");
if (paths.size() >= 2 && paths[1].find('@') != std::string::npos) {
continue;
}
configs.push_back(path);
} }
globfree(&glob_result); globfree(&glob_result);