From 3211dd2a8f659b42f9dfd84a2cb4b3ea9961cd66 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Sat, 11 May 2019 10:46:19 -0700 Subject: [PATCH] Ignore resources.arsc in apkdiff.py Due to a bug described in: https://issuetracker.google.com/issues/110237303 Ordering of resources can be non-deterministic. A comment on the issue indicates that this may be resolved in Android Gradle Plugin 3.4. We should revisit when we update. --- apkdiff/apkdiff.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apkdiff/apkdiff.py b/apkdiff/apkdiff.py index da19bf59db..69c1afbe6d 100755 --- a/apkdiff/apkdiff.py +++ b/apkdiff/apkdiff.py @@ -4,8 +4,9 @@ import sys from zipfile import ZipFile class ApkDiff: - - IGNORE_FILES = ["META-INF/MANIFEST.MF", "META-INF/SIGNAL_S.RSA", "META-INF/SIGNAL_S.SF"] + # resources.arsc is ignored due to https://issuetracker.google.com/issues/110237303 + # May be fixed in Android Gradle Plugin 3.4 + IGNORE_FILES = ["META-INF/MANIFEST.MF", "META-INF/SIGNAL_S.RSA", "META-INF/SIGNAL_S.SF", "resources.arsc"] def compare(self, sourceApk, destinationApk): sourceZip = ZipFile(sourceApk, 'r')