StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the symlink detection when signing TF.zip."

Browse Source
This commit is contained in:
Tao Bao
2017-05-23 18:15:42 +00:00
committed by Gerrit Code Review
parent 48ee187e98 406050bdb6
commit 78a41f6553
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/sign_target_files_apks.py
View File

@@ -93,6 +93,7 @@ import errno
import os import os
import re import re
import shutil import shutil
import stat
import subprocess import subprocess
import tempfile import tempfile
import zipfile import zipfile
@@ -191,6 +192,9 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
# tmpdir will only be used to regenerate the recovery-from-boot patch. # tmpdir will only be used to regenerate the recovery-from-boot patch.
tmpdir = tempfile.mkdtemp() tmpdir = tempfile.mkdtemp()
# We're not setting the permissions precisely as in attr, because that work
# will be handled by mkbootfs (using the values from the canned or the
# compiled-in fs_config).
def write_to_temp(fn, attr, data): def write_to_temp(fn, attr, data):
fn = os.path.join(tmpdir, fn) fn = os.path.join(tmpdir, fn)
if fn.endswith("/"): if fn.endswith("/"):
@@ -201,7 +205,7 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
if d and not os.path.exists(d): if d and not os.path.exists(d):
os.makedirs(d) os.makedirs(d)
if attr >> 16 == 0xa1ff: if stat.S_ISLNK(attr >> 16):
os.symlink(data, fn) os.symlink(data, fn)
else: else:
with open(fn, "wb") as f: with open(fn, "wb") as f: