diff --git a/linker/linker.cpp b/linker/linker.cpp index 4bcb89695..a3bd9641e 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -4082,6 +4082,11 @@ static std::string get_ld_config_file_path(const char* executable_path) { path.c_str(), executable_path); } + path = kLdConfigArchFilePath; + if (file_exists(path.c_str())) { + return path; + } + // Use generated linker config if flag is set // TODO(b/138920271) Do not check property once it is confirmed as stable if (android::base::GetBoolProperty("sys.linker.use_generated_config", true)) { @@ -4093,12 +4098,6 @@ static std::string get_ld_config_file_path(const char* executable_path) { } } - - path = kLdConfigArchFilePath; - if (file_exists(path.c_str())) { - return path; - } - path = get_ld_config_file_vndk_path(); if (file_exists(path.c_str())) { return path;