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

Commit 641d98df authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev am: c5fd7066

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895739

Change-Id: I7eaa03c19ddfe64b32b0a072556c4392a7ccf79c
parents 56c51077 c5fd7066
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -49,8 +49,10 @@ def CheckJar(allow_list_path, jar):
  if p.returncode != 0:
    return False
  items = stdout.split()
  classes = 0
  for f in items:
    if f.endswith('.class'):
      classes += 1
      package_name = os.path.dirname(f)
      package_name = package_name.replace('/', '.')
      if not package_name or not allow_list_re.match(package_name):
@@ -58,6 +60,9 @@ def CheckJar(allow_list_path, jar):
                              ' not in the allow list %s of packages allowed on the bootclasspath.'
                              % (jar, f, package_name, allow_list_path))
        return False
  if classes == 0:
    print >> sys.stderr, ('Error: %s does not contain any class files.' % jar)
    return False
  return True