Merge "Diff .art/.oat/.odex files now that they are deterministic"

am: 78861d7e6e

* commit '78861d7e6e56a770eb6c50370aa405992a3fab4c':
  Diff .art/.oat/.odex files now that they are deterministic
This commit is contained in:
Dan Willemsen 2016-02-01 22:42:50 +00:00 committed by android-build-merger
commit 822f20f933

View file

@ -51,9 +51,6 @@ def ignore(name):
'RECOVERY/RAMDISK/selinux_version']:
return True
# b/24201956 .art/.oat/.odex files are different with every build
if name.endswith('.art') or name.endswith('.oat') or name.endswith('.odex'):
return True
# b/25348136 libpac.so changes with every build
if name in ['SYSTEM/lib/libpac.so',
'SYSTEM/lib64/libpac.so']:
@ -76,6 +73,7 @@ def rewrite_build_property(original, new):
'ro.build.date=',
'ro.build.date.utc=',
'ro.build.host=',
'ro.build.user=',
'ro.build.description=',
'ro.build.fingerprint=',
'ro.expect.recovery_id=',