diff options
Diffstat (limited to 'init/host_import_parser.cpp')
-rw-r--r-- | init/host_import_parser.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/init/host_import_parser.cpp b/init/host_import_parser.cpp index faf6fc1e3..93e363ff3 100644 --- a/init/host_import_parser.cpp +++ b/init/host_import_parser.cpp @@ -23,22 +23,17 @@ using android::base::StartsWith; namespace android { namespace init { -Result<Success> HostImportParser::ParseSection(std::vector<std::string>&& args, - const std::string& filename, int line) { +Result<Success> HostImportParser::ParseSection(std::vector<std::string>&& args, const std::string&, + int) { if (args.size() != 2) { return Error() << "single argument needed for import\n"; } - auto import_path = args[1]; - - if (StartsWith(import_path, "/system") || StartsWith(import_path, "/product") || - StartsWith(import_path, "/odm") || StartsWith(import_path, "/vendor")) { - import_path = out_dir_ + "/" + import_path; - } else { - import_path = out_dir_ + "/root/" + import_path; - } + return Success(); +} - return ImportParser::ParseSection({"import", import_path}, filename, line); +Result<Success> HostImportParser::ParseLineSection(std::vector<std::string>&&, int) { + return Error() << "Unexpected line found after import statement"; } } // namespace init |