Merge changes I2e00bb66,I00890229 am: 6c597e6bdd

am: 11b5b1c992

* commit '11b5b1c9925acf80dd42a184e92870d6bfa54736':
  Do not diff .odex files
  Diff libpac.so now that it is deterministic
This commit is contained in:
Dan Willemsen 2016-02-03 19:05:09 +00:00 committed by android-build-merger
commit ced2a7d6a1

View file

@ -51,9 +51,8 @@ def ignore(name):
'RECOVERY/RAMDISK/selinux_version']:
return True
# b/25348136 libpac.so changes with every build
if name in ['SYSTEM/lib/libpac.so',
'SYSTEM/lib64/libpac.so']:
# b/26956807 .odex files are not deterministic
if name.endswith('.odex'):
return True
return False