summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2011-11-10 16:14:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-10 16:14:42 +0000
commit4906f456a4da1959fbe5172643b4091c74cc4f3e (patch)
tree9e2fb2fc620981dff0ef11e2f5741e74a5601f77 /tools
parent4e684cd7477b9d5182b33f35281dd3df7c8ee1a2 (diff)
parent53bef54cfff0cb9c6a67494b3e385a9617f75d03 (diff)
downloadbuild-4906f456a4da1959fbe5172643b4091c74cc4f3e.zip
build-4906f456a4da1959fbe5172643b4091c74cc4f3e.tar.gz
build-4906f456a4da1959fbe5172643b4091c74cc4f3e.tar.bz2
am 53bef54c: am 4b87f575: am 278c9781: to be upgraded, APKs must have exactly the same set of certs
* commit '53bef54cfff0cb9c6a67494b3e385a9617f75d03': to be upgraded, APKs must have exactly the same set of certs
Diffstat (limited to 'tools')
-rwxr-xr-xtools/releasetools/check_target_files_signatures4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/releasetools/check_target_files_signatures b/tools/releasetools/check_target_files_signatures
index 4e83129..7cb3e8a 100755
--- a/tools/releasetools/check_target_files_signatures
+++ b/tools/releasetools/check_target_files_signatures
@@ -347,8 +347,8 @@ class TargetFiles(object):
for i in all:
if i in self.apks:
if i in other.apks:
- # in both; should have at least one cert in common
- if not (self.apks[i].cert & other.apks[i].cert):
+ # in both; should have same set of certs
+ if self.apks[i].certs != other.apks[i].certs:
by_certpair.setdefault((other.apks[i].certs,
self.apks[i].certs), []).append(i)
else: