Merge "Removing local image lookup from load_buf" am: 77ac76c094 am: 0a2c44f5d3 am: 7e7f072d20

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

Change-Id: Idbef641ffd13b13f1eff43cc2f7413c4cd3ae94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Zheng 2023-06-22 20:08:40 +00:00 committed by Automerger Merge Worker
commit c1c3a5fe05

View file

@ -1076,9 +1076,7 @@ static bool load_buf(const char* fname, struct fastboot_buffer* buf) {
unique_fd fd(TEMP_FAILURE_RETRY(open(fname, O_RDONLY | O_BINARY)));
if (fd == -1) {
auto path = find_item_given_name(fname);
fd = unique_fd(TEMP_FAILURE_RETRY(open(path.c_str(), O_RDONLY | O_BINARY)));
if (fd == -1) return false;
return false;
}
struct stat s;