Merge "Fix incorrect input for path and entry" am: e98964339e am: 6fcd2b4325

Original change: https://android-review.googlesource.com/c/platform/build/+/2215166

Change-Id: I6d752e291ca12c3eedfade5e536bac0cdd9777b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-09-15 03:00:30 +00:00
committed by Automerger Merge Worker

View File

@@ -713,7 +713,7 @@ def IsZucchiniCompatible(source_file: str, target_file: str):
if entry in zfp.namelist():
return zfp.read(entry).decode()
else:
entry_path = os.path.join(entry, path)
entry_path = os.path.join(path, entry)
if os.path.exists(entry_path):
with open(entry_path, "r") as fp:
return fp.read()