Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ced2a7d6 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge changes I2e00bb66,I00890229 am: 6c597e6b

am: 11b5b1c9

* commit '11b5b1c9':
  Do not diff .odex files
  Diff libpac.so now that it is deterministic
parents b29fc11d 11b5b1c9
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -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