commit | 7e7f072d203f282502268c81b00e35ba36598e0e | [log] [tgz] |
---|---|---|
author | Daniel Zheng <zhengdaniel@google.com> | Thu Jun 22 19:22:00 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 22 19:22:00 2023 +0000 |
tree | c6452d8b8e262889f6be3437d340d2f3ada84a01 | |
parent | 02ae8c72370add9115a2f9fd92134fa6ddb77281 [diff] | |
parent | 0a2c44f5d3570f8978c53dd29f4c4d8c0361afb1 [diff] |
Merge "Removing local image lookup from load_buf" am: 77ac76c094 am: 0a2c44f5d3 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2633938 Change-Id: Ibcad1ceef6ce7c6bfe535d7847273c5c4984f046 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp index 4678655..faaca1d 100644 --- a/fastboot/fastboot.cpp +++ b/fastboot/fastboot.cpp
@@ -1076,9 +1076,7 @@ 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;