Consider build key abort separately from device_image
This will help untangle the device image change vs.
build key changed or aborted.
Test: presubmit
Bug: 335511290
Change-Id: I3c59c67e37f0d807b4826831bcce43503c3c29d9
diff --git a/src/com/android/tradefed/build/content/ImageContentAnalyzer.java b/src/com/android/tradefed/build/content/ImageContentAnalyzer.java
index 8d8a1e4..198af2c 100644
--- a/src/com/android/tradefed/build/content/ImageContentAnalyzer.java
+++ b/src/com/android/tradefed/build/content/ImageContentAnalyzer.java
@@ -62,10 +62,13 @@
|| AnalysisMethod.DEVICE_IMAGE.equals(
c.analysisMethod())))
.collect(Collectors.toList());
- // Handle invalidation should it be set.
+ // Handle invalidation should it be set for a device image.
for (ContentAnalysisContext context : buildKeyAnalysis) {
- if (context.abortAnalysis()) {
- CLog.w("Analysis was aborted: %s", context.abortReason());
+ if (AnalysisMethod.DEVICE_IMAGE.equals(context.analysisMethod())
+ && context.abortAnalysis()) {
+ CLog.w(
+ "Analysis was aborted: %s for %s",
+ context.abortReason(), context.contentEntry());
InvocationMetricLogger.addInvocationMetrics(
InvocationMetricKey.ABORT_CONTENT_ANALYSIS, 1);
return null;
@@ -102,6 +105,12 @@
/** Returns true if the analysis has differences */
private boolean buildKeyAnalysis(ContentAnalysisContext context) {
+ if (context.abortAnalysis()) {
+ CLog.w(
+ "Analysis was aborted for build key %s: %s",
+ context.contentEntry(), context.abortReason());
+ return true;
+ }
try {
List<ArtifactFileDescriptor> diffs =
TestContentAnalyzer.analyzeContentDiff(
