LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add 'unzip' option

Browse Source 
unzip option: 'unzip -qd target target/* search_path/*' before execution

Bug: 138639389
Test: place zip file in the dir, and then run compare_images with -u
Change-Id: I8ad442f32d8ab5a5e504882c6db0cae166fef42c
This commit is contained in:
Jeongik Cha
2019-08-07 10:43:20 +09:00
parent 95cc0dd43f
commit 5e22d28ecb
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vndk/tools/image-diff-tool/compare_images_and_print.sh
View File

@@ -2,7 +2,7 @@
build/soong/soong_ui.bash --make-mode compare_images build/soong/soong_ui.bash --make-mode compare_images
. build/envsetup.sh . build/envsetup.sh
lunch aosp_arm64 lunch aosp_arm64
out/host/linux-x86/bin/compare_images $1 out/host/linux-x86/bin/compare_images $1 -u
echo " - Common parts" echo " - Common parts"
cat common.csv cat common.csv
echo echo

8
vndk/tools/image-diff-tool/diff.py
View File

@@ -106,11 +106,17 @@ def main(all_targets, search_paths, ignore_signing_key=False):
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser(prog="compare_images", usage="compare_images -t model1 model2 [model...] -s dir1 [dir...] [-i]") parser = argparse.ArgumentParser(prog="compare_images", usage="compare_images -t model1 model2 [model...] -s dir1 [dir...] [-i] [-u]")
parser.add_argument("-t", "--target", nargs='+', required=True) parser.add_argument("-t", "--target", nargs='+', required=True)
parser.add_argument("-s", "--search_path", nargs='+', required=True) parser.add_argument("-s", "--search_path", nargs='+', required=True)
parser.add_argument("-i", "--ignore_signing_key", action='store_true') parser.add_argument("-i", "--ignore_signing_key", action='store_true')
parser.add_argument("-u", "--unzip", action='store_true')
args = parser.parse_args() args = parser.parse_args()
if len(args.target) < 2: if len(args.target) < 2:
parser.error("The number of targets has to be at least two.") parser.error("The number of targets has to be at least two.")
if args.unzip:
for t in args.target:
unzip_cmd = ["unzip", "-qd", t, os.path.join(t, "*.zip")]
unzip_cmd.extend([os.path.join(s, "*") for s in args.search_path])
subprocess.call(unzip_cmd)
main(args.target, args.search_path, args.ignore_signing_key) main(args.target, args.search_path, args.ignore_signing_key)