| commit | de3452fce25fdb98a5dab835ee9dd9911029b268 | [log] [tgz] |
|---|---|---|
| author | Paul Duffin <paulduffin@google.com> | Thu Jun 18 12:51:46 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 18 12:51:46 2020 +0000 |
| tree | e22926ef611aa129ba425a2a2df17214223ea169 | |
| parent | b74357aab77878a6540dcf4d3c889a17b79e99b6 [diff] | |
| parent | 9f58d772685ab4afddad6e0d1d40923a8c508124 [diff] |
Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev am: c5fd7066f5 am: 9f58d77268 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895739 Change-Id: Iaefa8978cc068a95bb3d6dc5a9aa7cae45c23a5d
diff --git a/core/tasks/check_boot_jars/check_boot_jars.py b/core/tasks/check_boot_jars/check_boot_jars.py index 6904a77..cf4ef27 100755 --- a/core/tasks/check_boot_jars/check_boot_jars.py +++ b/core/tasks/check_boot_jars/check_boot_jars.py
@@ -49,8 +49,10 @@ 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 @@ ' 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