diff options
author | Doug Zongker <dougz@android.com> | 2011-11-09 19:02:26 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-09 19:02:26 +0000 |
commit | 4b87f575d45320260e35f224cd18f36eec5e3eb2 (patch) | |
tree | afcb3ed78ec79c6447d7adf5f4c6866096bab5fa | |
parent | 2cc727144133b71534d3654bfd00f62a4ac353b1 (diff) | |
parent | 278c9781ec5d2ef289fee635dfcfd8befcfe531b (diff) | |
download | build-4b87f575d45320260e35f224cd18f36eec5e3eb2.zip build-4b87f575d45320260e35f224cd18f36eec5e3eb2.tar.gz build-4b87f575d45320260e35f224cd18f36eec5e3eb2.tar.bz2 |
am 278c9781: to be upgraded, APKs must have exactly the same set of certs
* commit '278c9781ec5d2ef289fee635dfcfd8befcfe531b':
to be upgraded, APKs must have exactly the same set of certs
-rwxr-xr-x | tools/releasetools/check_target_files_signatures | 4 |
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: |