aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Pasanen <dan.pasanen@gmail.com>2017-02-14 20:58:46 (GMT)
committerDan Pasanen <dan.pasanen@gmail.com>2017-02-14 20:59:43 (GMT)
commit86153fac0cebee346afbf9b883e21a0eb425f028 (patch)
tree71ff930ecd476b7da3f7cdbdc9a8d99a95c736d4
parent9c2a7fd2d73116bcaeb1af6b98bfa22356b8d09b (diff)
downloadandroid_build-staging/cm-14.1-cafrebase.zip
android_build-staging/cm-14.1-cafrebase.tar.gz
android_build-staging/cm-14.1-cafrebase.tar.bz2
Revert "build_image: Unbreak verity/FEC generation"staging/cm-14.1-cafrebaserefs/changes/55/161755/1
This reverts commit a1e0072263fa9fe42978e10c36f5ffb96a5816b8. Change-Id: I5a148f7d3636386a89bf7828beaff04c038d8728
-rwxr-xr-xtools/releasetools/build_image.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index ec487d4..e53115d 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -52,7 +52,7 @@ def RunCommand(cmd):
def GetVerityFECSize(partition_size):
cmd = "fec -s %d" % partition_size
- status, output = getstatusoutput(cmd)
+ status, output = commands.getstatusoutput(cmd)
if status:
print output
return False, 0
@@ -143,7 +143,7 @@ AdjustPartitionSizeForVerity.results = {}
def BuildVerityFEC(sparse_image_path, verity_path, verity_fec_path):
cmd = "fec -e %s %s %s" % (sparse_image_path, verity_path, verity_fec_path)
print cmd
- status, output = getstatusoutput(cmd)
+ status, output = commands.getstatusoutput(cmd)
if status:
print "Could not build FEC data! Error: %s" % output
return False
@@ -213,7 +213,7 @@ def Append2Simg(sparse_image_path, unsparse_image_path, error_message):
def Append(target, file_to_append, error_message):
cmd = 'cat %s >> %s' % (file_to_append, target)
print cmd
- status, output = getstatusoutput(cmd)
+ status, output = commands.getstatusoutput(cmd)
if status:
print "%s: %s" % (error_message, output)
return False