Merge "Fix incorrect input for path and entry" am: e98964339e
Original change: https://android-review.googlesource.com/c/platform/build/+/2215166 Change-Id: I6297abfe1e46c071a6e54660bc43a6a91c5d66d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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()
|
||||
|
Reference in New Issue
Block a user