aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-03-26 16:55:57 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-03-26 16:55:57 +0000
commite1df94c8419f9d41484d66dfa3c36b076542efcd (patch)
tree5413857d6725ea177cc1a19257d0b927344fa80b
parent89839911758b721603f11ea2edaed34e5c319d96 (diff)
parentfc51de455325ebca8bf4e28203a1143ba07076e2 (diff)
downloadbuild-e1df94c8419f9d41484d66dfa3c36b076542efcd.tar.gz
Merge "releasetools: Resolve symlinks in IsEntryOtaPackage()" into main
-rwxr-xr-xtools/releasetools/sign_target_files_apks.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
index 5d92eded43..b8f848fb2b 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -271,6 +271,10 @@ def IsOtaPackage(fp):
def IsEntryOtaPackage(input_zip, filename):
with input_zip.open(filename, "r") as fp:
+ external_attr = input_zip.getinfo(filename).external_attr
+ if stat.S_ISLNK(external_attr >> 16):
+ return IsEntryOtaPackage(input_zip,
+ os.path.join(os.path.dirname(filename), fp.read().decode()))
return IsOtaPackage(fp)